3301 commits

Author	SHA1	Message	Date
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	32331faee4	Prettify Bed Level Correction Matrix ... - Put + in front of positive values in the output	2015-03-25 22:13:59 -07:00
Scott Lahteine	f5f4c2b366	Merge branch 'Development' into fixup_leveling ... Latest upstream commits	2015-03-25 21:30:49 -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	5eff15c409	Merge branch 'Development' into fixup_leveling ... Latest upstream commits	2015-03-25 21:24:38 -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	5261d35737	Fix custom m-code behavior ... Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe	2015-03-25 21:20:50 -07:00
Scott Lahteine	fbf9b21e0c	Merge plus fixup zprobe_zoffset ... - Make `zprobe_zoffset` conditional - Fix ConfigurationStore for `zprobe_zoffset`	2015-03-25 21:14:00 -07:00
Scott Lahteine	96b5da7198	Fix up bed leveling code ... - Init `zprobe_zoffset` - Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the `set_bed_level_equation_*` functions - Apply standards to `mesh_bed_leveling` files - Document `MESH_BED_LEVELING`	2015-03-25 20:36:24 -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
AnHardt	f680e509c4	Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR()	2015-03-25 23:26:06 +01:00
Victor Torre	d43d47da14	Clean "fromsd" array is not SDSUPPORT ... if not have SDSUPPORT the fromsd array is not necessary	2015-03-25 22:05:18 +01:00
AnHardt	ac81b4084f	Make variables and function static.	2015-03-25 21:37:15 +01:00
alexborro	55025558dc	Implement Dry-Run mode in G29 ... It just probe all the bed without appliying the matrix. Useful after a first G29 to check the topology.	2015-03-25 11:12:30 -03:00
wurstnase	a4ad9117dd	comment #define Z_DUAL_STEPPER_DRIVERS	2015-03-25 13:46:29 +01:00
chris-bo	2dfd0e5ce7	Update Configuration.h ... documentation how to disable buzzer feedback	2015-03-25 12:44:29 +01:00
Christian Bohn	4c3cbc0961	use only one implementation for beeper feedback	2015-03-25 12:23:50 +01:00
AnHardt	01cc97a3c3	Corected condition for PIDdT	2015-03-25 12:08:23 +01:00
AnHardt	94330705c7	Move definition of PIDdT back to temperature.h ... make it unconditional remove all definitions in the 'Configuration.h's remove form 'Conditionals.h'	2015-03-25 11:51:41 +01:00
AnHardt	dd0067afa6	Fix MAX6675 again and introduce set_current_temp_raw() ... to make the temperature-code work again with Arduino 1.0.6. Sorry could not make an extra block on base level.	2015-03-25 11:08:24 +01:00
AnHardt	8848b7e9ef	Add the missed {} to END_MENU in ultralcd.cpp ... what caused an extra update of encoderLine most of the time.	2015-03-25 09:48:21 +01:00
AnHardt	4beffbca69	Make SMALL_INFOFONT configurable. ... Tweak the documentation	2015-03-24 23:40:04 +01:00
CONSULitAS	045ea42cc8	Merge remote-tracking branch 'upstream/Development' into Development	2015-03-24 22:52:02 +01:00
alexborro	c2ba5d0c09	Fix ZigZag and Topograph table ... ZigZag: Inverted Behavior.. If T supplied, it does not zigzag. Topograph table: The table was rotated 90º clockwise.	2015-03-24 15:50:31 -03:00
alexborro	0ce3576685	New Feature: Z_DUAL_ENDSTOPS ... Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper. That way the machine is capable to align the bed during home, since both Z steppers are homed. There is also an implementation of M666 (software endstops adjustment) to this feature. After Z homing, this adjustment is applied to just one of the steppers in order to align the bed. One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2. If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it is.. think about it) and the Z adjust would be positive. Play a little bit with small adjustments (0.5mm) and check the behaviour. The M119 (endstops report) will start reporting the Z2 Endstop as well.	2015-03-24 14:06:44 -03:00
AnHardt	c686069ccd	Revert "Remove 6x9 font" ... This reverts commit e6cb8ee188. Conflicts: Marlin/dogm_lcd_implementation.h Confilkt solved Needs rework.	2015-03-24 17:13:05 +01:00
AnHardt	b00a531df8	Revert "Removed now unneded FONT_STATUSMENU" ... This reverts commit 8c5bb38748.	2015-03-24 17:01:56 +01:00
AnHardt	9d589cbb2a	Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji ... Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved	2015-03-24 16:59:15 +01:00
Scott Lahteine	8db4fd7177	Merge branch 'Development' into planner_oh_planner ... Latest upstream commits	2015-03-23 22:08:50 -07:00
Scott Lahteine	0d81abe1c9	Merge branch 'Development' into config_testing ... Latest upstream commits	2015-03-23 21:13:04 -07:00
Scott Lahteine	01740fd9c6	Merge branch 'Development' into planner_oh_planner ... Latest upstream commits	2015-03-23 21:12:36 -07:00
Scott Lahteine	fc53e43de6	Don't test raw temp for MAX6675 ... - Remove test of raw temp for thermistor 0 when using MAX6675 - Longer `raw_temp_value` array for `TEMP_SENSOR_1_AS_REDUNDANT`	2015-03-23 20:55:48 -07:00
Scott Lahteine	03fa9fae9f	Merge branch 'Development' into fix_temperature_minmax ... Latest upstream commits	2015-03-23 20:42:48 -07:00
Scott Lahteine	1fac388664	Revert measurement loop	2015-03-23 15:18:22 -07:00
CONSULitAS	703f3b38c4	Merge remote-tracking branch 'upstream/Development' into Development	2015-03-23 17:40:49 +01:00
nicolas-rambaud	37cde8a191	Report changes from previous PR from old code base including : ... I've updated the minimum values from the LCD. It has been a while that i want to at least fix this. I have an inductive probe and often i need to set my zOffset to something lower than 0.5. With the current implementation, the default LCD value is set to 0.5 for some reason. On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5. Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful. Now we are able to change this value down to 0.0 if needed. I've also changed the minimum value for Z min acceleration. In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent. I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic.	2015-03-23 12:29:12 +01: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
wurstnase	e6f6c6e3a1	fix bad insertion config again	2015-03-23 08:32:48 +01:00
Scott Lahteine	6bdee87be3	Cleanup temperature code ... - Get rid of unused temp states in the ISR, resulting in more frequent temperature reading with fewer sensors - Shrink code slightly in min/max testing	2015-03-23 00:27:29 -07:00
Scott Lahteine	34a41648ab	Merge branch 'Development' into planner_oh_planner ... Latest upstream commits	2015-03-22 23:40:29 -07:00
Scott Lahteine	4fbb80567e	Get upstream commits	2015-03-22 23:07:22 -07:00
Scott Lahteine	7717e1ce33	Fix bad insert in configuration	2015-03-22 21:48:46 -07:00
Scott Lahteine	146501215f	Fix mangled probe_pt calls ... - Address issue #1669 - Remove the TOPO_ORIGIN configuration setting	2015-03-22 21:45:20 -07:00
maverikou	15345cc249	Corrected Z_PROBE_ALLEN_KEY behaviour.	2015-03-22 13:54:51 +02:00
maverikou	0f034dd97e	Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED.	2015-03-22 13:54:45 +02:00
maverikou	6c96f32069	Blind fix for #1507	2015-03-22 13:54:21 +02:00
Josef Larsson	379348487e	Removed malplaced comment.	2015-03-22 12:21:31 +01: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	582cd780cd	Fix compile error with *_DUAL_STEPPER_DRIVERS ... - Patch up macros in stepper.cpp	2015-03-21 16:43:47 -07:00
Josef Larsson	9b3462f73f	Refactor SCARA calibration. Save some lines of code and possibly ROM.	2015-03-22 00:37:24 +01:00
Scott Lahteine	691e753cc3	Don't add home offsets in G29 ... - Address #1262 by leaving values as set - Rename `add_homing` to `home_offset`	2015-03-21 16:30:02 -07:00
Scott Lahteine	88e81a4804	Latest upstream commits, plus fixes ... - Also add Manual Bed Leveling to the rest of the configs	2015-03-21 16:12:57 -07:00
Scott Lahteine	15eb5d35a2	Merge branch 'Development' into config_testing ... Latest upstream commits	2015-03-21 15:42:45 -07:00
Scott Lahteine	19df90622b	Include Conditionals.h file in update	2015-03-21 15:40:20 -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	2c9bd15625	Move LCD items to Conditionals.h ... - `Conditionals.h` is included twice, setting LCD values the first time	2015-03-21 15:24:57 -07:00
Scott Lahteine	63abeaff38	Merge branch 'Development' into config_testing ... Latest upstream commits	2015-03-21 15:03:06 -07:00
Scott Lahteine	3703694e30	Fix temperature min/max test ... - Base tests on all thermistors/thermocouples, not just heater 0	2015-03-21 14:23:43 -07:00
Edward Patel	3d0a060a7a	Added G29 command	2015-03-21 14:50:47 +01:00
Edward Patel	c516747847	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level	2015-03-21 14:49:52 +01:00
Scott Lahteine	af14c684b5	Minor optimizations to planner code ... - Prefetch values used more than once	2015-03-20 20:57:06 -07:00
Scott Lahteine	13fbf42d95	Cleanup of planner code ... - Use named axis indexes, `X_AXIS` etc. - Replace `block.steps_A` with block.steps[A]` - Replace `A_segment_time` with `segment_time[A]` - Add `A_AXIS`, `B_AXIS` for `COREXY` axes - Conditional compile based on `EXTRUDERS` - Add BLOCK_MOD macro for planner block indexes - Apply coding standards to `planner.h` and `planner.cpp` - Small optimizations of planner code - Update `stepper.cpp` for new `block` struct - Replace `memcpy` with loops, let the compiler unroll them - Make `movesplanned` into an inline function	2015-03-20 20:42:49 -07:00
AnHardt	64e3d33893	Fix shrinked menucode ... by updating 'encoderPosition' in END_MENU() line 1.	2015-03-20 23:36:14 +01:00
Edward Patel	a7e89d4cfa	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level	2015-03-20 15:46:01 +01:00
AnHardt	8c5bb38748	Removed now unneded FONT_STATUSMENU	2015-03-20 14:12:12 +01:00
Scott Lahteine	2176a22d42	Fix count_direction initializer ... - Addressing #1625	2015-03-20 05:45:05 -07:00
AnHardt	e72cb3e45d	Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji ... Conflicts: Marlin/dogm_lcd_implementation.h Marlin/ultralcd_implementation_hitachi_HD44780.h Fix merge conflicts 2	2015-03-20 13:35:47 +01:00
Scott Lahteine	cb6942d4a7	Merge branch 'Development' into config_testing ... Get upstream commits	2015-03-20 05:30:36 -07:00
AnHardt	6bfccaf99e	Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji ... Conflicts: Marlin/dogm_lcd_implementation.h Marlin/ultralcd_implementation_hitachi_HD44780.h Fixed conflicts 1	2015-03-20 13:08:18 +01:00
Scott Lahteine	5644ad6809	Fix hiliting of edit items	2015-03-20 04:29:35 -07:00
Scott Lahteine	63d5d28085	Merge branch 'Development' into config_testing ... Latest upstream changes	2015-03-20 04:15:18 -07:00
Scott Lahteine	526a755a66	Merge pull request #1652 from AnHardt/PIDdebug ... PID debug	2015-03-20 04:14:08 -07:00
Scott Lahteine	a1c240b0a4	Delta supports some auto bed leveling options	2015-03-20 04:04:45 -07:00
Edward Patel	5112cf8422	Added comment for the EEPROM storage	2015-03-20 11:46:47 +01:00
Edward Patel	4619d80524	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level	2015-03-20 11:45:06 +01: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	b6d381f863	Divide up Conditionals to get LCD items early	2015-03-20 02:50:28 -07:00
AnHardt	e85061d20d	Added changes to the 'new' Configuration.h s	2015-03-20 10:36:29 +01:00
Scott Lahteine	33c7c6e11d	Conditionals.h requires Arduino.h	2015-03-20 01:27:14 -07:00
Scott Lahteine	8ade04b78e	Felix and Hephestos configs ... - Not sure why these are showing as all new	2015-03-19 22:25:05 -07:00
Scott Lahteine	670006b919	Remove invariant code from Configurations ... - Add `Conditionals.h` with calculated configuration values - Add `SanityCheck.h` with checks for configuration errors - Remove equivalent code from all configurations - Move error checks from some sources to `SanityCheck.h` also - Fix initialization of count_direction in stepper.cpp	2015-03-19 22:22:23 -07:00
Edward Patel	a61f679568	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level	2015-03-20 02:28:35 +01:00
Edward Patel	c87faa69ed	Shortened mesh_plan_buffer_line()	2015-03-20 02:18:49 +01:00
AnHardt	47c1ea72af	Merge https://github.com/kieranc/Marlin into PIDdebug ... Conflicts: Marlin/temperature.cpp Cleaned merge conflict. Codeposition had changed. Variable pid_input had vanished. Signed-off-by: AnHardt <github@kitelab.de>	2015-03-20 00:07:36 +01:00
AnHardt	f1d3d1524d	Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify ... Conflicts: Marlin/dogm_lcd_implementation.h solved merge conflict.	2015-03-19 22:51:22 +01:00
AnHardt	fa889cd6e1	Beautivy statusscreen ... by shifting things some pixels around	2015-03-19 22:13:37 +01:00
Scott Lahteine	7279e4f82f	Small code tweaks re lcd.print	2015-03-19 14:01:33 -07:00
Scott Lahteine	90ba61b9b8	Include indicator for new drawmenu_generic ... In the new method we pass the character that should be used for selected state, not the character to print always.	2015-03-19 13:49:06 -07:00
Scott Lahteine	15d29efad5	Pass sel to lcd_implementation_mark_as_selected ... - Pass selected state directly to lcd_implementation_mark_as_selected - Rename sel function parameter - Include a minor fix for SdBaseFile.h	2015-03-19 13:40:36 -07:00
Scott Lahteine	a547dc2148	Merge branch 'Development' into optimize_menu_code ... Get upstream changes	2015-03-19 13:31:37 -07:00
CONSULitAS	9c1f6e7ac7	Merge remote-tracking branch 'upstream/Development' into Development	2015-03-19 18:49:34 +01:00
alexborro	e650d4044e	Fix "Stop Print" function in the LCD menu ... When one hit "Stop Print" option in LCD menu, the command buffer was not cleared. The printer keep moving until the buffer has been emptied. Actually I could not clear the command buffer as well.. I don't know why, it doesnt work as expected. I need to implement a routine inside Stepper ISR to handle such situation.	2015-03-19 14:16:18 -03:00
AnHardt	e917477fec	Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji ... Conflicts: Marlin/dogm_lcd_implementation.h Marlin/fonts/make_fonts.bat Claerd conflicts with my own #1621. (His was easy. :-) ) corrected typo in fonts/README.fonts Applied changes to the new delta-configurations and deletet there some extra whitespace at the line-endings.	2015-03-19 12:35:43 +01:00
AnHardt	ae01a6b5f2	Make use of codepos. ... Saves one addition. Needs one pointer on the stack. Don't know if this is a go trade.	2015-03-19 09:45:16 +01: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
Edward Patel	28c91deb5c	EEPROM saving of z_values. ... Tried to make it a little intelligent.	2015-03-18 21:07:07 +01:00
Edward Patel	240b5cfe04	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level	2015-03-18 19:19:46 +01:00
alexborro	4521f6655b	Restore "S" parameter of M204 for retrocompatibility.	2015-03-18 12:19:30 -03:00
alexborro	5ddb8d94e2	Update Documentation related to M204	2015-03-18 11:09:10 -03:00
AnHardt	f8c4d43886	delta[3] is used with SCARA ... Shoot in the dark.	2015-03-18 12:14:49 +01:00
AnHardt	72a9fed4fb	codepos not used in gcode_M28() ... Got: Marlin_main.cpp:2567: warning: unused variable 'codepos' Needs revision. Don't now how this should look like.	2015-03-18 11:41:14 +01:00
AnHardt	b94dd33641	G4 could wait for an undefined time ... Got: Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function And indeed codenum is undefined when no parameter is given.	2015-03-18 11:23:41 +01:00
AnHardt	e90985a4e8	delta[3] not used when DELTA not defined. ... got: Marlin_main.cpp:387: warning: 'delta' defined but not used Compiles cleaner when definition is removed.	2015-03-18 11:11:49 +01:00
AnHardt	5099b86ad4	lcd_autostart_sd() has two conditions. ... got: ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used	2015-03-18 10:51:13 +01:00
AnHardt	5d81c779cc	lcd_control_retract_menu() is conditional. ... Got: ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined	2015-03-18 10:39:59 +01:00
AnHardt	450b89e63c	Negative times are unlikly ... While bunting an other bug I stumbled across: ultralcd.cpp:1250: warning: comparison between signed and unsigned integer expressions Changed to the type of lcd_next_update_millis.	2015-03-18 10:31:34 +01:00
AnHardt	d1658eebfc	Decrease KILL_DELAY ... Users hat to press kill-button for unexpexted lon times. See #1593	2015-03-18 01:45:42 +01:00
Wurstnase	00adb2a6c1	optional parameters must be named when ignoring order	2015-03-18 01:02:29 +01:00
Edward Patel	0d43898a22	Remove of mesh_plan_buffer_line parameter reference (e)	2015-03-17 22:55:29 +01:00
Edward Patel	8067a985ce	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level ... Fixed conflicts: Marlin/planner.h	2015-03-17 22:48:08 +01:00
wurstnase	05333f61b7	fix macro	2015-03-17 12:50:44 +01:00
AnHardt	1883e1bb60	Applied thinkyheads corrections from 2015-03-17	2015-03-17 11:23:44 +01:00
AnHardt	be79235ef2	Add new (cleaner) Marlin font ... with sources in /fonts	2015-03-17 10:33:02 +01: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
CONSULitAS	2b1ddc0413	Merge remote-tracking branch 'upstream/Development' into Development	2015-03-16 22:12:17 +01:00
alexborro	cb676cdf39	Fix CoreXY homing bug introduced by PR #1606 ... The Check Endstop logic must be: if (current_block->steps_x != current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits, Y_AXIS))) if (TEST(out_bits, X_HEAD)) not if (TEST(out_bits, X_HEAD) && (current_block->steps_x != current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits, Y_AXIS)))) Same applies for Y axis.	2015-03-16 16:31:25 -03:00
AnHardt	8a29dd4839	Cleaned typo in dogm_lcd_implementation.h	2015-03-16 20:18:48 +01:00
AnHardt	7e69f72db6	Moved font directory. Updated README.fonts	2015-03-16 17:27:27 +01:00
AnHardt	00b162a993	Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji ... Conflicts: Marlin/language.h Conflict cleaned	2015-03-16 17:13:49 +01:00
AnHardt	e38dd5f030	Merge remote-tracking branch 'origin/utf' into utf-kanji	2015-03-16 17:00:54 +01:00
AnHardt	08e4651ece	Corrected cyrillic font again ... Thank you @Nprod.	2015-03-16 16:59:14 +01:00
Wurstnase	752c804677	remove offset, add minimum scan area	2015-03-16 15:13:16 +01:00
Wurstnase	14f0250853	allow negative values ... and some more comments	2015-03-16 14:26:59 +01:00
AnHardt	e6cb8ee188	Remove 6x9 font ... in dogm_lcd_implementation.h by using standard font and shifting down temperature displays by one pixel Saves 2300 bytes.	2015-03-16 11:18:27 +01:00
maverikou	e93eb3e8d3	Update test	2015-03-16 09:16:00 +02:00
maverikou	b8ae3feb9e	Update test	2015-03-16 09:03:15 +02:00
maverikou	3570447ded	Fix Z_RAISE_AFTER_PROBING	2015-03-16 08:35:49 +02:00
maverikou	8a739b6fba	Merge branch 'Development' into delta_auto_bed_level ... Conflicts: Marlin/Marlin_main.cpp	2015-03-16 08:24:26 +02:00
Scott Lahteine	7629c4f05c	Cleanup for menu optimization ... - Compare pr_char to space - Fewer calls to lcd_strlen	2015-03-15 22:54:54 -07:00
Scott Lahteine	3405f85a6a	Reduce size of menu code ... - Get rid of _selected functions, passing selected state instead	2015-03-15 22:02:33 -07:00
Edward Patel	e983a5ab92	Disable option. Enable for use/test.	2015-03-16 02:50:11 +01:00
Edward Patel	f34b9c83d1	Added comment about MESH_NUM axis points.	2015-03-16 01:48:46 +01:00
Scott Lahteine	a686c9878f	Move TOPO_ORIGIN define to Configuration.h ... - Addressing issue #1608	2015-03-15 15:49:36 -07:00
Edward Patel	8005d22c81	Added menu option for bed leveling.	2015-03-15 23:24:32 +01:00
Edward Patel	0e51e53813	WIP. Adding bed leveling code.	2015-03-15 23:24:32 +01:00
Scott Lahteine	d0d12962e0	Merge pull request #1615 from AnHardt/fix-1611 ... Fix #1611	2015-03-15 15:19:02 -07:00
AnHardt	f0dcea7e14	Fix #1611 ... Warning: suggest parentheses around comparison in operand of & pretty much helped.	2015-03-15 22:52:50 +01:00
AnHardt	28b1c37dea	Fix for #1612	2015-03-15 21:35:33 +01:00
CONSULitAS	a8c1bdabd2	Update: readme.md for K8200 example ... * readme.md: updated typo and URLs	2015-03-15 17:25:31 +01:00
AnHardt	2f374f1465	Removed Kanji.	2015-03-15 16:44:37 +01: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	b80ed51fcc	Fix controllerFan() code ... - Add support for 4th extruder - Fix parentheses matching - Apply coding standards - Address issue mentioned at #1575	2015-03-15 06:55:31 -07:00
Scott Lahteine	4b50205f11	Merge branch 'Development' into marlin_configurator ... Latest upstream changes	2015-03-15 06:37:32 -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	4eabd80025	Fix babystep for extruder_duplication	2015-03-14 18:31:25 -07:00
alexborro	d3259d0dba	Merge pull request #1581 from msutas/Development ... Filament Runout Sensor Feature	2015-03-14 18:35:20 -03:00
AnHardt	25c4f17e5d	Corrected Cyrillic fonts. Round II.	2015-03-14 15:10:45 +01:00
chris-bo	b73ba26b23	Update ultralcd_st7920_u8glib_rrd.h	2015-03-14 14:31:00 +01:00
Scott Lahteine	c37f7d15c9	- Rename WRITE_E_STEP for consistency ... - Add BIT and TEST macros - Add _APPLY_ macros to stepper.cpp to help with consolidation - Consolidate code in stepper.cpp using macros - Apply standards in stepper.cpp - Use >= 0 instead of > -1 as a better semantic - Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS	2015-03-14 04:28:22 -07:00
AnHardt	44a205d9d9	Corrected Cyrillic fonts. ... Cleaned typo in language_test.h Cyrillic part.	2015-03-14 12:27:47 +01:00
chrono	4d878b9bac	Fixed path typos in README	2015-03-14 10:18:12 +00:00
chrono	12ec557a75	Added DEFAULT_TRAVEL_ACCELERATION	2015-03-14 10:14:13 +00:00
chrono	1d25d510bc	Upstream Merge Fixes	2015-03-14 09:48:30 +00:00
chrono	a89d690b77	Merge remote-tracking branch 'upstream/Development' into pr-felix	2015-03-14 09:25:43 +00:00
Scott Lahteine	cb57fc727d	Declare pid_output for PIDBEDTEMP	2015-03-13 20:19:51 -07:00
Scott Lahteine	3d6deb9bdf	Simplify manage_heater ... - Make separate get_pid_output(e) and get_pid_output_bed() function - Reduce size of manage_heater function - Hopefully work around linker errors	2015-03-13 19:49:41 -07:00
AnHardt	730497aaa1	Make use of ligatures in language_kana_utf8.h	2015-03-13 19:47:40 +01:00
AnHardt	3240d89f7d	Logic cleanup in utf_mapper.	2015-03-13 19:45:10 +01:00
alexborro	2f3c77b751	Fix decimal places in G29 Bed Equation Coeficients	2015-03-13 14:39:41 -03:00
AnHardt	96f8d20f2f	Change selection logic another time ... Automatic selection was to unflexible. Updated documentation Updated language files to new logic and documentation. Updated bdf2u8g.exe	2015-03-13 14:26:58 +01:00
Wurstnase	76da32b567	add hash-bang for python3	2015-03-13 07:44:20 +01:00
Wurstnase	2e7ba44633	some renaming for readability	2015-03-13 07:31:27 +01:00
Scott Lahteine	352aa3f4c5	Merge branch 'Development' into marlin_configurator ... Latest upstream	2015-03-12 17:12:51 -07:00
Scott Lahteine	e3ca9137b5	Fix missing temp_error declarations ... - Fix for #1591 replacing #1595	2015-03-11 16:38:42 -07:00
Wurstnase	0620267ebb	g29 auto-mode for the new G29 LRFB ... short: this script scans the first few lines from a gcode. If the line between 2 different z are greater than min_g1 this is our first layer. On this layer we search the min and max values of X and Y. With an offset we write that in a new file.	2015-03-11 23:53:28 +01:00
Scott Lahteine	08694339eb	Merge branch 'Development' into marlin_configurator ... Conflicts: Marlin/Configuration.h	2015-03-11 15:47:32 -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
Mehmet Sutas	b373826428	Merge pull request #2 from MarlinFirmware/Development ... update	2015-03-12 00:07:39 +02:00
AnHardt	5bafb1fe1f	Add user test to language_test.h and make it default. ... Improve description in Configuration.h	2015-03-11 20:46:52 +01:00
alexborro	c0b6075f77	Fix max acceleration limits in planner ... The max acceleration limiting was in wrong place.	2015-03-11 15:08:11 -03:00
alexborro	9157cbd8f3	Add Travel Acceleration and change the M204 options ... Added option to set Travel Acceleration (non printing moves). The M204 options was a non sense (S for printing moves and T for retract moves). It has been changed to: P = Printing moves R = Retract only (no X, Y, Z) moves T = Travel (non printing) moves I will add this info o G-Code wiki in reprap.org. I also advise to put this info in Marlin next version changelog.	2015-03-11 13:19:02 -03:00
alexborro	888cf161bd	fix travel speed option for G29 ... I forgot to enclousure the variable with #ifdef	2015-03-11 10:03:32 -03:00
alexborro	af63b54562	Add travel speed option to G29 command line	2015-03-11 09:51:56 -03:00
AnHardt	817751d4b9	Added new languages, the Cyrillic display and a test language to find out your hardware.	2015-03-11 11:10:35 +01:00
AnHardt	c4b0087f7a	Insert utf_mapper.h ... Top -> down - Decide what output function is to use. - Precautions. If non of the DISPLAY_CHARSET_HD44780's is selected fall back to Japanese. - When we are not on the dogms setup a mapping table depending on display type and mapper. - If we are on dogm we use ONE To ONE mapping - except kanji. - select and define one of the mapping functions.	2015-03-11 10:55:16 +01:00
AnHardt	b60761bcff	Removed some messages that shouldn't be translated in the Japanese files. ... And made falback to kana work.	2015-03-11 10:30:38 +01:00
AnHardt	97ae3c5c6a	Corected some errors inrtoduced by a faild global replacement.	2015-03-11 10:26:36 +01:00
AnHardt	ae76b1e8a8	Changes in dogm_lcd_implementation.h in detail. ... Top -> down - We don't need the old Marlion_font package any more - we made new. - But we need information about configured fonts and the mappers. - We support Cyrillic now. - LCD_CLASS is not used in this file. LiquidCrystalRus.h is deleted anyway. - define some fonts - BIG_EDIT_FONT works only together with western languages. - Select a matching FONT for the MENUE depending on the defined language. - Number the different font-types. Wanted to avoid to store complete font-structures when changing fonts back and forth. - Marlin special symbols are now at the lower end - like in 'ultralcd_implementation_hitachi_HD44780.h' - insert the new remembering setFont function. - insert the new counting lcd_print functions. - make use of the new setFont and lcd_print functions. - On some places redefined one character long strings with chars to avoid overhead and reduce warnings.	2015-03-10 22:34:56 +01:00
alexborro	5bf42066fa	Fix typo in configuration.h	2015-03-10 15:06:34 -03:00
alexborro	8a4b62d081	Set more regular setup in configuration.h	2015-03-10 14:41:21 -03:00
AnHardt	255ca68123	Changes in ultralcd_implementation_hitachi_HD44780.h in detail ... Top -> down: We don't need LiquidCrystalRus.cpp and LiquidCrystalRus.h any more. Functionality is now in utf_mapper.h Comment on LCD_STR_BEDTEMP about behaviour in strings. Change LCD_STR_ARROW_RIGHT from "\x7E" to ">" because "\x7E" is only ARROW_RIGHT on displays with DISPLAY_CHARSET_HD44780_JAPAN. Introduce the counting UTF8 enabled lcd_print functions. Replace the old lcd.print functions and make use of them. A bit of reformatting around the changes.	2015-03-10 18:30:09 +01:00
alexborro	60ceca1bc1	Add speed configuration for home-bumping movement	2015-03-10 14:08:32 -03:00
AnHardt	6fc2ccd568	Make use of new remenbering fontswitch.	2015-03-10 18:04:03 +01:00
AnHardt	0f26f3abf2	Add a test_language. ... Will show the compleet utf8 or ASCII charset To se the second half of ASCII click on "01234..."	2015-03-10 17:59:28 +01:00
AnHardt	901cf203fe	Add legal stuff to marlin_kanji.h	2015-03-10 17:49:16 +01:00
AnHardt	2d5134b0ed	Introduce - clean - prepae language files	2015-03-10 17:46:25 +01:00
domonoky	d813090d90	Merge remote-tracking branch 'remotes/upstream/Development' into Development ... Conflicts: Marlin/Marlin_main.cpp Marlin/stepper.cpp	2015-03-10 10:46:37 +01: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
maverikou	53abc5e2f1	Merge branch 'Development' into delta_auto_bed_level	2015-03-09 22:28:57 +02:00
Mehmet Sutas	956fb2d278	Merge pull request #1 from MarlinFirmware/Development ... update	2015-03-09 11:05:49 +02:00
Scott Lahteine	978dadf806	Base64 decode AJAX-fetched text properly	2015-03-08 21:54:17 -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
maverikou	424c747fb3	Enable M401 and M402 for deltas with allen key z-probes.	2015-03-08 09:57:38 +02:00
maverikou	0d593ab7c1	Fix debug message	2015-03-08 09:41:31 +02:00
Greg Alexander	3e8c5678f5	fix bug where, i.e., "G1X1E1" would be interpretted as "G1 X10 E1", ... because strtod() will read the E address value as if it was a base 10 exponent.	2015-03-07 21:14:34 -05:00
Greg Alexander	ed7874b4e0	M404 should not use 'N' address as parameter because 'N' is reserved for the line number	2015-03-07 17:35:06 -05:00
Greg Alexander	b9dfa5cad4	use code_value_long() instead of (int)code_value()	2015-03-07 17:33:15 -05:00
Greg Alexander	901b03d020	use strtol() instead of strtod() when an integer value is desired	2015-03-07 17:24:26 -05:00
Greg Alexander	4fba7b084f	fix typo in delta example config introduced in ... commit 697ee2dc50	2015-03-07 16:43:41 -05:00
Mehmet Sutas	cfc6a3a87a	Filament Runout Sensor Feature ... With this change a mechanical or optical switch may be used to check the availability of the filament and when the filament runs out an M600 (filament change) command is issued. This is only done while printing with an SD card. This feature was requested several times (issue #679), but the requests were not accepted since it was believed that this situation should be handled at host side. However during an SD print the control is totally on firmware and I think that during an SD print it should be handled by the firmware. The original code was posted at reprap forum (http://forums.reprap.org/read.php?1,297350) by Lazymonk. I have only corrected some bugs of the code and improved it by adding definitions to the configuration.h in order to make it more standardized.	2015-03-07 22:43:15 +02:00
maverikou	e6862700af	Add Z_RAISE_AFTER_PROBING to all config files	2015-03-07 20:55:30 +02:00
maverikou	39d255608d	Test an extra delta configuration with auto bed leveling code paths	2015-03-07 20:53:23 +02:00
maverikou	7c24b97958	Ported over Johann Rocholl's improvements for delta printers: ... - Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path. - Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.	2015-03-07 20:36:21 +02:00
Wurstnase	a5342c942e	Update Marlin_main.cpp	2015-03-07 16:47:53 +01:00
Scott Lahteine	0f3b7d5575	Update annotated configurations ... - Also update base configs	2015-03-07 01:07:40 -08:00
Scott Lahteine	c5aa56bc4d	Merge branch 'Development' into marlin_configurator ... Latest upstream commits	2015-03-06 23:00:03 -08:00
Scott Lahteine	d085725c86	More sanity-checking for ABL ... - Moved sanity-checks to Marlin_main.cpp - Applied to other configuration files - Fixed formatting of ABL output - Passing verbose level to probe_pt - Miscellaneous cleanup - Put CONFIG_STEPPERS_TOSHIBA into Configuration.h	2015-03-06 22:14:34 -08:00
Scott Lahteine	8b6766b37b	Merge branch 'Development' into marlin_configurator ... Latest upstream changes	2015-03-06 16:32:57 -08:00
Scott Lahteine	9eed8c8cf0	Make sure a ROM is selected for ULTRA_LCD	2015-03-06 15:37:54 -08:00
AnHardt	7136268273	Added 'dogm_font_data_6x10_marlin_Kanji.h' ... This is copied from http://www.thingiverse.com/thing:664397 // Japanese Original font // Version 0.1 by ichibey // // 営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。 // http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode This font is very special. It uses a mixture of katakana an kanji symbols, uses multi character symbols and is only addressable by '\xxx' sequences.	2015-03-07 00:26:28 +01:00
AnHardt	16e173e167	Added 5 new font.h files to main directory. ... The former place of 'dogm_font_data_6x9_marlin.h' was in 'dogm_font_data_m0arlin.h'. Deleted 'dogm_font_data_marlin.h'.	2015-03-07 00:09:49 +01: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	25dc79f124	Remove M48 credits also	2015-03-06 14:54:30 -08:00
Scott Lahteine	34e51f576f	Fix compile error in gcode_G29 ... - A redo of #1576, which missed topo_flag - Always set verbose_level	2015-03-06 14:52:05 -08:00
AnHardt	b14270b029	Added font tools	2015-03-06 23:48:55 +01:00
AnHardt	fe2bd237d5	Add font sources. ... Fonts have been created with fony.exe (http://hukka.ncn.fi/?fony) The HD44760_? fonts simulate the fonts of the character based displays. The ISO10646 fonts provide the right size of the standard fonts. Marlin_symbols contains only the the special symbols of the original marlin font.	2015-03-06 23:36:56 +01: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	1149c24b86	More grouping, cleanup, start on overrides	2015-03-06 08:48:53 -08:00
Wurstnase	62bd734612	fix controllerFan() for inverted enable pins ... add ```^ !(n_ENABLE_ON)``` for each stepper	2015-03-06 12:01:17 +01:00
AnHardt	3024f6c706	Undubble MSG_MIN &MSG MAX	2015-03-06 00:25:44 +01:00
Gina Häußge	63b62d8d4e	Fixed in-line comments and escaping ... * "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode. * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly. Tested with the following commands: * M117 Hello ; test => displays "Hello" on display, ignores "test" * G1 X1 ; foo => moves 1mm in X, ignores "foo" * ; test => completely ignored, not even acknowledged * M117 Hello \;) => displays "Hello ;)" on display * M117 Hello \\;) => displays "Hello \" on display, ignores ")"	2015-03-05 23:30:34 +01:00
C-o-r-E	99fb1bc3e8	Attempt to resolve #1568 and add basic escape character support	2015-03-05 15:22:37 -05:00
Scott Lahteine	fad14ae7eb	Merge branch 'Development' into marlin_configurator ... Latest upstream changes	2015-03-05 05:32:31 -08:00
Scott Lahteine	cdc38aa783	Move gcode handlers into inline functions	2015-03-05 04:27:24 -08:00
Scott Lahteine	6d9e9a6bef	Merge branch 'Development' into enhanced_g29 ... Latest upstream changes	2015-03-05 02:49:18 -08:00
Scott Lahteine	4db2179f5c	Include 4th extruder support	2015-03-05 02:37:36 -08:00
OhmEye	f90a947e65	Fix autoretract ... Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.	2015-03-04 20:28:08 -10:00
Scott Lahteine	2ef6b3d57a	Fix wrong defines, broken syntax	2015-03-04 22:24:44 -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	32744d41a9	Do sanity checking on LRFB values ... - Setting boundaries based on configured limits, contrasting with G28 (which forgets these limits?)	2015-03-04 21:32:11 -08:00
chrono	0a7d85c20e	Minor fixes	2015-03-04 12:35:32 +00:00
chrono	48e3a97a18	Removed extra encoder definitions from pins_FELIX2.h	2015-03-04 12:21:18 +00: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
chrono	d8eeddfb93	Updated DUAL Extruder config, added README and enabled NEWPANEL by default	2015-03-04 09:59:58 +00:00
chrono	b423b90c77	Added Configuration_adv.h to examples for LCD/SD Support	2015-03-03 19:09:25 +01:00
domonoky	075507fb9a	missed one X_ENABLE_PIN	2015-03-03 11:09:56 +01:00
Scott Lahteine	dfb38874f8	Some suggested changes for #1555	2015-03-03 00:48:20 -08:00
Scott Lahteine	7f8ea7105f	Arrange ProbeAction values bitwise	2015-03-02 20:14:37 -08:00
Scott Lahteine	7684721977	Enhanced G29 ... - Adapted “Enhanced G29” code referred to in #1499 and posted at [3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_ Leveling-Enhanced-G29-command) - Compatible with current G29 while adding some new arguments - `V` sets the verbose level for serial out - `T` (or `V` > 2) send a Topology report to serial out - `E` works the same way as before - `P` works as before (source used `n` or `U`/`u`) - `L`, `R`, `B`, `F` work as before - Still needs sanity checking for `LRBF`	2015-03-02 20:00:17 -08:00
C-o-r-E	874d3d3fc5	Add support for solenoid articulated extruders	2015-03-02 20:07:12 -05:00
chrono	7540a81106	Minor fixes	2015-03-02 22:55:00 +01:00
chrono	a375d648c7	Merge remote-tracking branch 'upstream/Development' into Development	2015-03-02 17:21:05 +00:00
domonoky	4a7aca2736	Merge remote-tracking branch 'remotes/upstream/Development' into Development	2015-03-02 17:52:12 +01:00
alexborro	715104e477	Fix Endstop check for CoreXY bots. ... The X_Axis could not home to min while Y_Max endstop was trigged.	2015-03-02 13:36:58 -03: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	20e59dc61e	Don't skip files starting with underscores	2015-03-02 07:56:11 -08:00
Scott Lahteine	f171656f8e	Cleanup of cardreader.* ... - Apply standards to cardreader.* - Fix minor issues with cardreader.cpp - Apply standards to some other stale regions	2015-03-02 07:06:01 -08:00
Scott Lahteine	f379edca78	Cleanup rotary encoder encrot* defines ... The encrot values are used in only one place, and don’t vary, so remove redundant references.	2015-03-02 06:42:48 -08:00
Scott Lahteine	c7cdb176c8	Merge branch 'Development' into marlin_configurator ... Latest upstream changes	2015-03-02 06:13:10 -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	f2710e11d1	Optimize initial loading, code cleanup	2015-03-02 05:23:36 -08:00
chrono	558c6313f7	Merge branch 'pr-felix' into Marlix	2015-03-02 10:27:58 +00:00
chrono	08bc723a3c	Enable PIDBED	2015-03-02 10:26:42 +00:00
chrono	e487bd642b	Updated PR to streamline integration	2015-03-02 09:49:45 +00:00
Scott Lahteine	2eeb241b42	Find fields that group together ... - Do field grouping - Tweak configurations for better grouping	2015-03-02 01:45:53 -08:00
Scott Lahteine	e30bfedce4	Fix undefined *_PROBE_BED_POSITION error	2015-03-01 19:57:35 -08:00
chrono	3eafea840d	Minor fixes in Configuration.h	2015-03-01 11:04:02 +01:00
chrono	c7fb1b70f2	Initial Configuration.h for Felix 2.0/3.0	2015-03-01 09:54:36 +00:00
chrono	2e172f38bd	Added support for Felix 2.0/3.0 printers	2015-03-01 09:16:55 +00:00
Scott Lahteine	f994729999	Parse and use dependent groups ... - Parse #if, #ifdef, etc. for rules to enable fields	2015-02-28 22:40:20 -08:00
maverikou	9b50ec6512	Panel One encoder pins	2015-02-28 10:52:15 +02:00
Scott Lahteine	838a22de64	Fix switch value method, make app global	2015-02-27 21:08:09 -08:00
Scott Lahteine	8d5839151b	Merge branch 'Development' into marlin_configurator ... Latest upstream changes	2015-02-27 20:40:23 -08:00
domonoky	443e7edef4	- Add support for L6470 Drivers. ... - Both TMC, L6470 and pin-driven drivers work. - All can be mixed and matched as needed.	2015-02-27 12:43:23 +01:00
Scott Lahteine	1db02c2891	Merge branch 'Development' into fixup_temperature ... Merge upstream changes	2015-02-26 17:25:28 -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
domonoky	5727cb3ed4	Cleanup TMC Stepper a bit.	2015-02-26 12:57:46 +01: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	1a7b0d9a37	Redo HAS_* macros to fix define error	2015-02-26 01:14:59 -08:00
Scott Lahteine	864dddc878	Macros to the top, a few HAS_* macros	2015-02-26 00:33:30 -08:00
alexborro	227ab8c665	Merge pull request #1503 from MarcelMo/patch-2 ... Support for simple customisable AutoZProbing area	2015-02-25 13:22:42 -03:00
Scott Lahteine	fd1ea9d56f	Move literal strings to language files	2015-02-24 23:03:08 -08:00
maverikou	8742b6bd56	Merge branch 'Development' into panel_one	2015-02-24 22:24:57 +02:00
Scott Lahteine	aa9c1f1bed	Better name for ADC macro	2015-02-24 05:38:10 -08:00
Scott Lahteine	9c9726d469	Cleanup of temperature code ... - Reduce calls to millis() - General cleanup of manage_heaters - General cleanup of pid autotune - Formatting here & there - Macros to clean up and shrink ISR code (reduced by ~364 lines)	2015-02-24 04:46:11 -08:00
AnHardt	c6d2ebe452	Extend the idea of dummy temperature sensors. ... Added a second sensor and made them configurable.	2015-02-24 11:02:16 +01:00
Scott Lahteine	c9a3eb0c1a	Spacing in calculate_volumetric_multiplier(s)	2015-02-23 20:35:18 -08:00
Scott Lahteine	2af559cca3	Shared function for menu_edit_* and menu_edit_callback_*	2015-02-23 20:31:28 -08:00
Scott Lahteine	df8c51528f	Merge branch 'Development' into cleanup_ultralcd ... Latest upstream changes	2015-02-23 20:13:08 -08:00
Scott Lahteine	517f411999	Spacing adjustment to menu_edit* macro	2015-02-23 20:11:52 -08:00
Scott Lahteine	4938ae5caf	Add required backslash for macro expansion	2015-02-23 20:10:49 -08:00
Scott Lahteine	e182cdebf9	Add required backslash for macro expansion	2015-02-23 19:54:07 -08:00
Scott Lahteine	fa4c36df68	Fix menu callback issue wrt LCD_CLICKED	2015-02-23 19:40:57 -08:00
Scott Lahteine	0cf0c20532	Optimize calculate_volumetric_multiplier	2015-02-23 18:10:35 -08:00
domonoky	38500165ea	First attempt at adding TMC Driver support. May need some cleanup.	2015-02-23 17:45:29 +01:00
domonoky	b55995aae8	Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation.	2015-02-23 16:12:35 +01:00
kieranc	8ccdac9898	Enable PID debugging for heated bed	2015-02-23 09:42:01 +01:00
kieranc	29097b0ab2	Enable PID debugging for heated bed	2015-02-23 09:41:25 +01:00
kieranc	21bd4fd6db	Enable PID debugging for heated bed	2015-02-23 09:40:53 +01:00
kieranc	fb56aad898	Enable PID debugging for heated bed	2015-02-23 09:40:29 +01:00
kieranc	08c543f8fb	Enable PID debugging for heated bed	2015-02-23 09:40:06 +01:00
kieranc	c89413db1e	Enable PID debugging for heated bed	2015-02-23 09:39:39 +01:00
kieranc	1c71e4751a	Enable PID debugging for heated bed	2015-02-23 09:39:07 +01:00
maverikou	a9e15aa503	Updated example configurations	2015-02-22 20:15:05 +02:00
Scott Lahteine	3ba47ea277	Remove test/demo multi=line code menu items	2015-02-22 10:10:37 -08:00
Scott Lahteine	c1240f23dd	Merge branch 'Development' into marlin_configurator ... Latest upstream changes	2015-02-22 10:02:25 -08:00
alexborro	a57869ba49	Dummy Thermistor Table for testing purposes ... Am I the only one who always need to change the thermistortable.h to add a dummy table?? Ok, it is done. Just set the thermistor to 999 and it will always read 25C. Great for Testing or Development purposes.	2015-02-22 11:02:04 -03:00
Maverikou	2e166f5337	Added support for PanelOne from T3P3.	2015-02-22 09:14:43 +02:00
Scott Lahteine	40ef472a25	Merge in encoder multiplier	2015-02-21 20:18:49 -08:00
Scott Lahteine	1c13cd604b	Formatting in babysteps defines	2015-02-21 18:45:10 -08:00
Scott Lahteine	3a26804d80	Adapt to latest PID code and fix typos	2015-02-21 18:41:04 -08:00
Scott Lahteine	422582da71	Prep formatting for upcoming PR	2015-02-21 18:24:16 -08:00
Scott Lahteine	27ac3e985d	Add options to example_configurations	2015-02-21 18:17:37 -08:00
Scott Lahteine	0d6a7a2df0	Merge with latest upstream changes	2015-02-21 18:13:31 -08:00
Scott Lahteine	c7a97e18b7	Merge branch 'Development' into cleanup_ultralcd ... Latest upstream changes	2015-02-21 18:04:08 -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	57bc28b42c	Cleanup and fix ultralcd.cpp ... - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting	2015-02-21 17:38:56 -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	430c4b6538	Replace missing backslash	2015-02-20 02:17:16 -08:00
Scott Lahteine	3aa5f98b64	Download all as ZIP, adjust layout on resize	2015-02-20 02:12:00 -08:00
Scott Lahteine	a8939eec28	Readability of MENU_MULTIPLIER_ITEM ... Last commit before bed.	2015-02-20 02:08:41 -08:00
Scott Lahteine	09e09b308e	Tweaky spacing adjustments	2015-02-20 01:22:56 -08:00
Scott Lahteine	e3fd3e8fa4	Fix typos in checkExtruderAutoFans	2015-02-20 00:08:59 -08:00
Scott Lahteine	c610471b0c	Add PID_PARAMS_PER_EXTRUDER conditional	2015-02-20 00:00:19 -08:00
Scott Lahteine	2d6fa9ce80	Proper implementation of PID menu items ... - Make this work per #1344	2015-02-19 23:54:06 -08:00
wgm4321	b8e79dce89	Fix compilation errors when encoder multiplier is disabled	2015-02-19 21:51:23 -05:00
wgm4321	65e1fc71be	Add encoder rate multiplier	2015-02-19 21:42:57 -05:00
Scott Lahteine	859c8d3fef	Azteeg X3 overrides too	2015-02-19 17:28:38 -08:00
Scott Lahteine	7891eacf21	Merge branch 'Development' into fixup_ramps_boards ... - Also apply cleanup for #1514	2015-02-19 17:26:22 -08:00
Scott Lahteine	1600506545	Merge remote-tracking branch 'upstream/Development' into marlin_configurator	2015-02-19 15:15:55 -08:00
Scott Lahteine	5d0c93ae10	Keep config boxes in view on wide screen	2015-02-19 03:41:41 -08:00
Scott Lahteine	335b7680c9	Tooltip code, widescreen layout, hide auto-expands ... Slightly better layout for wide screens.	2015-02-19 03:11:16 -08:00
domonoky	15b73386b5	Add pin definitions for the Boards BAM&DICE + BAM&DICE Due	2015-02-19 11:53:31 +01: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	f238c7428d	Merge branch 'Development' into marlin_configurator ... Latest upstream changes	2015-02-18 21:56:17 -08:00
Scott Lahteine	da275c72ab	Cleanup Github reply.data.content before atob()	2015-02-18 21:45:38 -08:00
MagoKimbra	159196d1e9	Reset Alert message when finish M600 command	2015-02-18 21:33:38 +01:00
daid	266ff227cf	Merge pull request #1510 from docdawning/Development ... Trivial spelling correction	2015-02-17 20:59:32 +01:00
DocDawning	dfd4e74a5c	Trivial spelling correction	2015-02-17 12:37:05 -07:00
AnHardt	6cdcd6c6d1	Fix iss#1492 ... Introduced lcd_strlen() and lcd_strlen_P(). Replaced the old functions where necessary. Reworked language_ru.h. Speeded up test for zero length string in cardreader.cpp	2015-02-16 13:53:58 +01:00
Scott Lahteine	c033904693	Updated config file section markers	2015-02-15 23:25:57 -08:00
Scott Lahteine	84a87a5b1c	Fix up configs a little	2015-02-15 23:19:22 -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	efb0491d40	Merge branch 'Development' into issue_1499 ... Merging latest upstream changes	2015-02-15 22:59:07 -08:00
Scott Lahteine	8309b4f408	Merge branch 'Development' into marlin_configurator ... Merging latest upstream changes	2015-02-15 22:58:04 -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	b71322e793	Issue #1504 – K8200 Z_ENABLE_PIN ... - K8200 uses a non-standard RAMPS with Z_ENABLE=63 ?? - Assuming from previous input that 3DRAG is the same.	2015-02-15 21:56:23 -08:00
Scott Lahteine	978d114c73	Bed leveling probe behavior issue? ... The `float` keyword should not be on these vars because they conceal the outer vars, preventing them from obtaining known values before being passed in `set_bed_level_equation_3pts`. Possibly related to `Z_RAISE_BETWEEN_PROBING` not functioning.	2015-02-15 20:51:27 -08:00
Scott Lahteine	7c6236761a	Merge branch 'Development' into issue_1493 ... Merging latest upstream changes	2015-02-15 20:45:35 -08:00
Scott Lahteine	9875352dd8	Merge branch 'Development' into marlin_configurator ... Merging latest upstream changes	2015-02-15 20:44:21 -08:00
MarcelMo	d28f5b9e82	Support for simple customisable AutoZProbing area ... When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size). Not much code, but very useful. Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling. I used int for values... might be wrong... I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits)	2015-02-15 15:58:29 +01:00
Tommi Lamberg	513ff94b89	Merge remote-tracking branch 'upstream/Development' into Development	2015-02-15 12:21:45 +02:00
Scott Lahteine	83cb702e72	Config sections, multi-field values, toggles, etc ... - Auto-detect “switchable” items where possible - Handle switchable multi-value fields - Add standard sections to config form - Add section markers to configurations - Add value options to configurations - Remove and re-add fields for loaded configs - Preserve sections across configs - Preserve non-added fields - Style added fields wider & newline by default	2015-02-14 23:44:01 -08:00
alexborro	afc737ca0c	Fix CoreXY Homing Routine. ... Fixed how stepper ISR figure it out when the head (extruder) is going to Min or Max direction. Added Homing to Max Endstops.	2015-02-13 14:38:05 -02:00
Scott Lahteine	ec53c6309a	More fields, options in config, fix tooltips	2015-02-13 03:02:56 -08:00
Scott Lahteine	68184af57b	Merge branch 'Development' into marlin_configurator ... Latest upstream commits	2015-02-12 21:59:26 -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
Natealus	ea9e49b20d	ARRAY_BY_EXTRUDERS 4th hotend PID parameters	2015-02-12 00:56:47 -07:00
Scott Lahteine	d0ad8a978c	Megatronics 3 servo pins ... - Naive implementation, assuming the data sheet pin numbers correspond to Arduino pin numbers.	2015-02-11 23:46:27 -08:00
Scott Lahteine	e74138b2be	More robust fetch code, download buttons ... - Fetch code now handles github, local, or http: access - Download button creates a time-stamped inline download - More complete error messages - Show warnings when approaching the hourly fetch quota (limit reloading!) - Added my test domain (where the _htaccess is deployed) - `_htaccess` file added to set Access-Control-Allow-Origin “*” - Marlin logo with css - Limit selectable areas to avoid annoying selections - Messages now persist until dismissed - Default repo for files set to thinkyhead, ‘marlin_configurator’ branch - Cosmetic changes	2015-02-11 04:59:07 -08:00
Tommi Lamberg	622a531d9c	Fixed error in translation	2015-02-11 08:50:48 +02:00
Tommi Lamberg	290ab42d22	Updated Finnish translations	2015-02-11 08:37:07 +02:00
Jérémie FRANCOIS	22a7985445	reverted to upstream	2015-02-11 07:12:55 +01:00
Jérémie FRANCOIS	b3bda57ca2	reverted to upstream	2015-02-11 07:12:02 +01:00
Jérémie FRANCOIS	9d75a56b56	Merge remote-tracking branch 'upstream/Development' into Development ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp	2015-02-11 06:38:36 +01:00
Tommi Lamberg	0a59fee763	Merge remote-tracking branch 'upstream/Development' into Development	2015-02-11 06:53:43 +02: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
kieranc	b9ed873827	Enable PID debugging for heated bed	2015-02-10 14:13:06 +01:00
kieranc	0a19109476	Enable PID debugging for heated bed	2015-02-10 14:11:44 +01:00
Tommi Lamberg	a4f939cc27	Updated Finnish language file	2015-02-10 10:48:33 +02:00
Scott Lahteine	32d4dd073f	Merge pull request #1487 from AnHardt/iss1485 ... Fix for #1485	2015-02-09 21:41:07 -08:00
AnHardt	c246026bda	Sorry.	2015-02-10 00:23:39 +01:00
AnHardt	07e488cfae	Fix for #1485	2015-02-10 00:13:46 +01:00
Souko	e7ecf14d0c	Update ultralcd_st7920_u8glib_rrd.h ... Fixed delay-times during Init. REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER won't get initialized on some Boards because delay was to short.	2015-02-09 21:46:06 +01:00
Scott Lahteine	52c3cf6d34	Fix a logging error	2015-02-09 05:07:05 -08:00
Scott Lahteine	ba24a09f24	Use api.github to get Configurations ... - Make api.github the default source for configurations - Remove configurations from the configurator - Continuation and enhancements	2015-02-09 04:34:57 -08:00
Natealus	f4b0a40abb	Additional fixes to temperature.cpp and found another missing line ... Looks like INVERT_E3_DIR was missing in the configuration.h also as I did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also added those lines too. Additional formatting to make the comments line up better in that section.	2015-02-08 15:43:58 -07:00
AnHardt	3aac2df057	Now the oter way around. ... Include of language_en.h now behind national language. All "#define MSG_STR_*" now surrounded by #ifndef and #endif.	2015-02-08 20:41:20 +01:00
AnHardt	488633bf44	#include "language_en.h" before the national language in language.h ... + May decrease the workload for feature developers. They may omit to update all the language files but "language_en.h". When loading _en first, all new features give some display, but the new in English. - May throw some additional warnings about redefinition during compile.	2015-02-08 14:26:24 +01:00
AnHardt	8e92729141	Make display language configurable in Configuration.h	2015-02-08 13:45:22 +01:00
Natealus	38a500d05c	Viki 2 Implementation ... I've insert the define and pointer entries for the Viki 2 and miniViki from Panucatt in all of the example configs and main config. With these additions and with pins done in the old single pin.h style...I was able to get the display working fine save for needing to turn Delta Segments per Second down. But that's a common graphics lcd issue being looked into right now. I need assistance in understanding how the new divided pins files fit together because my previous attempts at trying to get it to work appropriately didn't seem successful. This originally came from trying to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg X3 Pro. It only comes with one set of connectors and they're Min Endstops. My previous experience didn't turn out well trying to tell the firmware to home to the Min Endstops so the best solution I found was to swap the pins in the firmware. If I'm missing a conflict with a setup other than delta please let me know, but it makes sense in my setup.	2015-02-08 03:14:59 -07:00
Natealus	697ee2dc50	Compiling errors with 4 Extruders defined ... Here were a few changes that I had to make/add lines for the 4th hotend. A compiling problem in the Temperature.cpp and missing lines in configuration.h and configuration_adv.h. I added these lines in all of the example configs too.	2015-02-08 01:05:05 -07:00
Jérémie FRANCOIS	85e5aa4011	Generalized enqueue_commands_P, and moved them to Marlin_main as they should	2015-02-07 23:24:20 +01:00
Scott Lahteine	4228758f1d	Clean up and improve tooltips, show the name	2015-02-07 11:58:19 -08:00
Scott Lahteine	0116320d2c	Strip slashes off the front of tooltips	2015-02-07 11:04:10 -08:00
Scott Lahteine	69240d41b0	Offset the timing of the pulsing animation	2015-02-07 10:45:56 -08:00
Scott Lahteine	78b9428f4e	Avoid capturing disabled items in comments	2015-02-07 10:34:16 -08:00
Scott Lahteine	5d159851e5	Fix positioning of tooltip	2015-02-07 09:03:00 -08:00
Scott Lahteine	c99f1de9f3	Fix tooltips blocking clicks	2015-02-07 07:39:10 -08:00
Scott Lahteine	1a548c1bc1	Find nearby comments and make them into tooltips	2015-02-07 06:20:04 -08:00
Scott Lahteine	90fa1345b0	Fix purge + refresh of define info	2015-02-07 03:02:26 -08:00
Scott Lahteine	aa67b38a44	Fan speed and 4th extruder on graphical LCD ... - Display fan speed 0-1 as “—“ and 254-255 as “100%”. - Display 4th extruder instead of the heated bed	2015-02-07 02:44:35 -08:00
Scott Lahteine	7850ae2f4f	Merge branch 'Development' into marlin_configurator ... Merge latest Development	2015-02-07 02:20:25 -08:00
Scott Lahteine	2647402095	Use info.repl in updateDefineFromField, fix regex	2015-02-07 02:04:44 -08:00
Scott Lahteine	12a3975341	Close section tag, add String.prototype.lineCount	2015-02-07 00:46:14 -08:00
Scott Lahteine	4bb72f9480	Highlight the edited line ... - Add a span to the edited text line to provide a highlight - Scroll and highlight for switch checkboxes also - Clean up initialization - More API documentation - Smarter handling of asynchronous file loading during init	2015-02-06 23:46:16 -08:00
Scott Lahteine	37c43a7ab3	Scroll to reveal on switches as well	2015-02-06 18:09:14 -08:00
Scott Lahteine	9c0adae3cd	Scroll to setting position in file when edited ... - Animate scrolling to the edited item’s position - Sanity check file drops and show warnings - Fix form init / refresh on new configuration drop - Document the API methods that get/set defines	2015-02-06 17:57:31 -08:00
Scott Lahteine	4d341bb758	Copy configs into subfolder ... Browsers may not want to load files outside the folder, but they may be okay with these relative references within the folder.	2015-02-06 14:58:47 -08:00
Scott Lahteine	72856166a9	Fix bad typo in ConfigurationStore.cpp	2015-02-06 14:43:58 -08:00
Scott Lahteine	b51204cc1c	Add fieldsets and make them into tabs	2015-02-05 20:28:39 -08:00
Scott Lahteine	56769ba4f8	Make comment/uncomment a little neater	2015-02-05 19:39:42 -08:00
Scott Lahteine	94bebf31ac	Pre-collect info about options on field init ... - When initializing fields use the configuration to determine the format - Cache the line for each option for fastest string compare / replace - Add logging levels for debugging	2015-02-05 19:30:11 -08:00
Scott Lahteine	32aaadc301	Include minimized jQuery 2.1.3	2015-02-05 11:50:42 -08:00
Scott Lahteine	53f6bbdfe0	Try a stepper for the serial port	2015-02-05 11:44:43 -08:00
Scott Lahteine	ac7a4358d6	Add a responsive file uploader ... - Specify HTML5 - Allow drag and drop for loading configurations	2015-02-05 11:14:31 -08:00
Scott Lahteine	09a385d9b0	Add "use strict" to the top.	2015-02-05 08:22:51 -08:00
Scott Lahteine	b2627200ea	Get thermistors from config, add temp sensors	2015-02-05 08:19:09 -08:00
Scott Lahteine	ef18bfdd3f	An in-place browser-based configurator utility ... - A web form with fields for configuration values - Reads and parses standard config files - Modifies configurations dynamically in-place	2015-02-05 07:05:29 -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
CONSULitAS	cfbb94a2a8	K8200: Example Configuration.h fixed ... Example Configuration.h: fixed strange white characters preventing compilation in lines 1 and 3 - oops	2015-02-04 10:35:10 +01: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
CONSULitAS	0de5083aff	K8200: Example Configurations readme.md updated ... Example Configurations for K8200 readme.md updated * readme.md: added description for german umlaut support on LCD	2015-02-04 00:24:51 +01:00
CONSULitAS	c421ffd520	K8200: Example Configuration_adv.h back in sync ... Example Configuration_adv.h for K8200 back in sync * Configuration_adv.h: rebased and added missing changes for 4th extruder	2015-02-04 00:19:18 +01:00
CONSULitAS	0575dd10de	K8200: Example Configuration.h back in sync ... Example Configuration.h for K8200 back in sync * Configuration.h: rebased and added missing changes * Configuration.h: updated comments for K8200	2015-02-04 00:15:50 +01:00
AnHardt	f708884808	Introduced new function lcd_implementation_mark_as_selected() ... New function now drops the prechar (select character) and makes the first column usable for text. Marking the line is now constantly made by highlighting (reverse). Replaced selection code in: lcd_implementation_drawmenu_generic() _drawmenu_setting_edit_generic() _drawmenu_sd() with new function.	2015-02-03 23:35:33 +01: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	8663f4bbaf	Apply some cleanup for recent merge ... Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use that.	2015-02-03 11:48:49 -08:00
Scott Lahteine	0cb1029311	remove extra plan_buffer_line	2015-02-03 11:26:36 -08:00
AnHardt	9381bfe7f9	Fixes issue #1447 - Overlapping of long descriptions with values.	2015-02-03 20:15:16 +01:00
Scott Lahteine	b97a950f53	Apply fix for M600 filament change ... - Patch from #1453 for delta movement plan - Fix: Set X with code X instead of adding to X	2015-02-03 09:57:16 -08:00
AnHardt	2abf1ad940	Distribute recent changes in Configuration.h to the examples.	2015-02-03 17:59:04 +01:00
AnHardt	33f8580255	Merge branch 'lcd-width' into b-	2015-02-03 14:45:58 +01:00
AnHardt	0c24bb6cfc	Adjust LCD_WIDTH to make better use of DOGM LCDs	2015-02-03 14:21:43 +01:00
AnHardt	b1dbd765c6	Centralise definition of fonts for DOGM displays ... Prework for issue #1448 and #1447 Will merge in when pull request #1457 is in.	2015-02-03 13:10:09 +01:00
AnHardt	65642592ee	Added dualline version.	2015-02-03 12:25:36 +01:00
AnHardt	f9cc1df00b	Droped URL from bootsplash.	2015-02-03 11:14:27 +01:00
AnHardt	c20606b8d7	Replaced some literal constants with defines ... Replaced calculation to centre bitmap with fixed values. Saved 20 bytes.	2015-02-03 09:52:29 +01:00
AnHardt	3602474c25	Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin ... and win another 1694 bytes.	2015-02-03 09:07:57 +01:00
AnHardt	f5fd94d62a	Kick suspicious loop an win 72 bytes. ... No visible impact.	2015-02-03 08:56:00 +01:00
Scott Lahteine	b3973ed224	Fix HD44780 misspelled as HD44870	2015-02-02 22:33:58 -08:00
Scott Lahteine	d8b7f29fa2	Merge pull request #1452 from thinkyhead/fix_M200_bug ... M200 cleanup, normalization of EXTRUDER loops	2015-02-02 21:58:15 -08:00
Scott Lahteine	6d81968db5	Merge pull request #1450 from docdawning/Development ... Normalized section headers, added some headers, added help URLs for newb...	2015-02-02 21:17:06 -08:00
DocDawning	5bb3933b21	Fixed n00bsauce	2015-02-02 14:18:53 -07:00
DocDawning	d109cd940b	Normalized all configuration files to include my new section headers and the like.	2015-02-02 14:11:21 -07:00
DocDawning	055c4beaf9	Normalized section headers, added some headers, added help URLs for newbies	2015-02-02 14:11:09 -07:00
Scott Lahteine	9dc5de6166	Hide code that makes veteran geeks go "aha!"	2015-02-02 05:55:55 -08:00
Scott Lahteine	bd387068bb	Apply loops for extruders elsewhere also	2015-02-02 05:27:27 -08:00
Scott Lahteine	4a146d584b	Loop, since the pending feature can use an array	2015-02-02 05:16:17 -08:00
Scott Lahteine	bca884bf72	Realized it's not a bug, but cleanup code anyway	2015-02-02 04:41:31 -08:00
AnHardt	2dd43a82b1	Ups. #else added	2015-02-01 14:16:35 +01:00
AnHardt	26e55471f8	Update example configurations.	2015-02-01 13:46:32 +01:00
AnHardt	85385be132	Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description.	2015-02-01 13:33:25 +01:00
AnHardt	0e40408ee5	Make exemplaric use of new display charsets in language_en.h and languag_de.h	2015-02-01 13:20:58 +01:00
AnHardt	8dce5a6644	Improve new charset featur. ... Select DOGM-displays automaticly. Give hint where to find charsets. Add '²' and '³' characters.	2015-02-01 13:09:59 +01:00
Scott Lahteine	c009c81e65	make marlin-main the default	2015-01-31 23:11:28 -08:00
Scott Lahteine	f4ebc02555	marlin url	2015-01-31 23:09:12 -08:00
Scott Lahteine	0af9a0bf57	url to firmware downloads	2015-01-31 22:19:45 -08:00
Scott Lahteine	5f8dd92905	toss in a fix for .ru	2015-01-31 21:58:38 -08:00
Scott Lahteine	3f3ad9b3ad	typo	2015-01-31 21:42:53 -08:00
Scott Lahteine	07639053fb	Add support for BQ Prusa i3 "Hephestos"	2015-01-31 21:38:30 -08:00
Philip Schell	fb7c636ecf	Avoid compiling error ... Only a missing ","... now it will compile again	2015-02-01 01:33:04 +01:00
alexborro	787d6fb61a	Update RUMBA pins file ... Add FAN1_PIN and SERVO0_PIN	2015-01-31 18:03:28 -02:00
Scott Lahteine	5fd5105d44	Merge pull request #1439 from clefranc/Development ... Fix nozzle in temperature menu	2015-01-30 19:05:45 -08:00
AnHardt	76bf93efcb	Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h" ... This reverts commit 4d5b0e2037.	2015-01-30 22:42:44 +01:00
AnHardt	4d5b0e2037	get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h	2015-01-30 22:20:10 +01:00
Christian Lefrançois	33408a4dfc	Update ultralcd.cpp ... Fix number of nozzle displayed in temperature menu.	2015-01-30 11:16:13 -05:00
AnHardt	6e6e3cf443	merged https://github.com/MarlinFirmware/Marlin.git	2015-01-30 11:05:29 +01:00
AnHardt	b3ca430a20	Inducted the defined placeholders in the translation table.	2015-01-30 10:35:14 +01:00
AnHardt	e045034c3f	Included Configuration.h to read the defined charsets. ... Defined the charsets plus a default.	2015-01-30 10:31:58 +01:00
AnHardt	27c638803e	Defined three charsets.	2015-01-30 10:28:22 +01:00
Scott Lahteine	073c59c50a	Clean up some formatting ... - Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.	2015-01-29 18:52:21 -08:00
AnHardt	9a4d4b3a2f	translated Deltamenu	2015-01-29 13:19:32 +01:00
AnHardt	8aa6487b4b	MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein'	2015-01-29 13:12:55 +01:00
AnHardt	666ad7106b	Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD	2015-01-29 13:09:12 +01:00
AnHardt	e5c45fbe8c	Infoscreen messages end with a '.' if not to long. ... MSG_NO_MOVE = 'Kein Zug.' > 'Motoren Eingesch.' hat mich grau Haare gekostet. Die englisch Meldung will sagen - Du kannst jetz am Extruder arbeiten, die Achsen sind bockiert, die Motoren sperren die Achsen weil sie unter Strom stehen, weil sie eingeschaltet sind.	2015-01-29 13:02:21 +01:00
AnHardt	1e22137e27	MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch' ... to work out that this can't be resumed.	2015-01-29 12:41:46 +01:00
AnHardt	05d2ebd118	MSG_WATCH > 'Beobachten' > 'Info'	2015-01-29 12:29:31 +01:00
AnHardt	06cba91c39	eye candy 2	2015-01-29 12:26:21 +01:00
AnHardt	9352c9547f	MSG_SPEED = 'Geschw' > 'Geschw.'	2015-01-29 12:13:44 +01:00
AnHardt	0dfb0162f3	eye candy.	2015-01-29 12:07:01 +01:00
AnHardt	7222b27501	MSG_MOVE_AXIS = 'Achsen bewegen' > 'Bewegen'. Is Extruder an axis?	2015-01-29 12:02:58 +01:00
AnHardt	a6f808c9b1	remove unused #define MSG_RETRACT	2015-01-29 11:58:50 +01:00
AnHardt	152fa579f5	MSG_SWITCH_PS_OFF = 'Switch Power Off' -> 'Netzteil Aus'	2015-01-29 11:55:36 +01:00
AnHardt	7a32b742f3	MSG_SWITCH_PS_ON = 'Switch Power On' ->'Netzteil Ein'	2015-01-29 11:50:51 +01:00
AnHardt	4e176d2ce8	MSG_SET_ORIGIN = 'Setze Nullpunkt' ->'Setze Null hier'	2015-01-29 11:45:18 +01:00
AnHardt	1f8c8ad3ed	MSG_SET_HOME_OFFSETS = 'Set home offsets' ->'Setze Home hier'	2015-01-29 11:39:35 +01:00
AnHardt	0e8836ce5e	MSG_AUTO_HOME = 'Auto Nullpunkt' ->'Home'	2015-01-29 11:36:07 +01:00
AnHardt	56d3e6615d	MSG_DISABLE_STEPPERS = 'Stepper abschalt.' -> 'Motoren Aus'#	2015-01-29 11:19:10 +01:00
Scott Lahteine	1258980832	Merge pull request #1429 from bq/Development ... Add bq Witbox 3D printer	2015-01-29 01:14:18 -08:00
Victor Andueza	766762a4dc	Change url link	2015-01-29 09:28:50 +01:00
Scott Lahteine	7df9ca051c	Merge pull request #1428 from thinkyhead/issue_1388_eeprom ... Make EEPROM storage consistent	2015-01-28 22:58:04 -08:00
Scott Lahteine	fe3810f073	yeah, what he said	2015-01-28 22:27:15 -08:00
Scott Lahteine	6137bbd484	use eeprom read correctly	2015-01-28 22:10:31 -08:00
Scott Lahteine	9bc9051405	Flag EEPROM write errors on serial output ... - Also adds a language string for the error. - Also adds SERIAL_EOL as an alias for SERIAL_ECHOLN(“”)	2015-01-28 21:19:51 -08:00
Scott Lahteine	ff99ca3040	Fix alignment of Restore following PIDTEMP ... Should be reading 4 x 4 PID values instead of 4 x 3	2015-01-28 20:48:32 -08:00
Philip Schell	6c285930cb	Fixing wrong pin to heater extruder 2 <-> 3 ... Extruder 2 and 3 was swapped	2015-01-28 23:57:22 +01:00
Victor Andueza	0d4ce27b79	Add pins_WITBOX file	2015-01-28 17:26:50 +01:00
Victor Andueza	13118cde33	Add bq Witbox 3D printer	2015-01-28 16:52:36 +01:00
Scott Lahteine	093fedfde8	Make EEPROM storage consistent ... Update ConfigurationStore to always write dummy values for disabled options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM version to “V15.” Also fixes a buffer overrun with axis_scaling in Config_ResetDefault.	2015-01-28 01:08:48 -08:00
Scott Lahteine	34377ee512	Merge pull request #1427 from thinkyhead/fewer_preheat_strings ... Remove language strings that only add a number	2015-01-27 22:10:08 -08:00
Scott Lahteine	7378a7fef4	Merge pull request #1408 from thinkyhead/cleanup_servo ... Formatting cleanup of quiet sources	2015-01-27 22:09:04 -08:00
Scott Lahteine	5fbef6bed2	Merge pull request #1409 from thinkyhead/rename_lastnr ... Rename lastnr to autostart_index and...	2015-01-27 22:07:23 -08:00
Scott Lahteine	53eea611b8	Fix MSG_NOZZLE	2015-01-27 22:00:32 -08:00
Scott Lahteine	d7211a5324	Changes for Portuguese too	2015-01-27 21:53:08 -08:00
Scott Lahteine	0a21727c0a	Portuguese (pt) and Brazilian Portuguese (pt-br)	2015-01-27 21:45:21 -08:00
Scott Lahteine	c90f2e77d8	Remove language strings that only add a number ... This won’t reduce the string storage in the end, but it makes the language files smaller. Also removed remaining unused strings.	2015-01-27 21:36:58 -08:00
Scott Lahteine	2ce4a102ee	Add support for Megatronics 3 a la #1426	2015-01-27 15:54:46 -08:00
Scott Lahteine	ae4b348d77	Make sure _Ex_PINS is defined ... Also fix analogInputToDigitalPin so it uses proper C hex notation	2015-01-27 15:36:47 -08:00
Scott Lahteine	80be6f3f91	tweak tweak	2015-01-27 15:36:47 -08:00
Scott Lahteine	ebe78cb36f	tweak	2015-01-27 15:36:47 -08:00
Scott Lahteine	82474fef8a	Max endstop pins disabled by configuration ... There’s no need to ask users to uncomment Max Endstop pins when they have them. These will be set to -1 later if the endstop option is disabled.	2015-01-27 15:33:21 -08:00
Scott Lahteine	8045e4d60d	Add support for 4th extruder ... #1405 includes some changes to pins.h for a 4th extruder. This commit applies those changes. It also deals with a possible problem with SENSITIVE_PINS.	2015-01-27 15:33:21 -08:00
Scott Lahteine	df4f3e7712	cleanup	2015-01-27 15:32:34 -08:00
Scott Lahteine	b6ecbd8cc4	cleanup	2015-01-27 15:32:34 -08:00
Scott Lahteine	4e573134de	Cleanup heading	2015-01-27 15:32:34 -08:00
Scott Lahteine	574a5ab72a	Split up pins to make it more manageable ... Hopefully this is helpful to organization and future expansion….	2015-01-27 15:32:34 -08:00
clefranc	d55c62bf9f	Update ConfigurationStore.cpp ... Moved #endif to allow filament settings to print.	2015-01-27 13:28:37 -05:00
clefranc	e779641c73	Update ConfigurationStore.cpp ... Added PIDTEMP dummy write to align EEPROM read/write operation.	2015-01-27 13:25:47 -05:00
Scott Lahteine	baac6e242d	Merge pull request #1419 from AnHardt/bootsplash ... repair Bootsplash	2015-01-27 00:30:29 -08:00
AnHardt	75cf302da3	example configurations changed to meet Configuration.h	2015-01-27 00:01:33 +01:00
Philip Schell	61fd45a0c2	Add 4th extruder	2015-01-26 21:22:00 +01:00
Philip Schell	2650be4921	Add 4th extruder	2015-01-26 21:21:31 +01:00
Philip Schell	a9763d894e	Add 4th extruder	2015-01-26 21:20:56 +01:00
Philip Schell	4949088302	Add 4th extruder	2015-01-26 21:20:04 +01:00
Philip Schell	fc5204bd42	Add 4th extruder	2015-01-26 21:17:35 +01:00
Philip Schell	9834818ef7	Add 4th extruder	2015-01-26 21:16:23 +01:00
Philip Schell	8696963154	Add 4th extruder	2015-01-26 21:15:24 +01:00
Philip Schell	ee8a7419f4	Add 4th extruder	2015-01-26 21:14:18 +01:00
Philip Schell	e18403235d	Add 4th extruder	2015-01-26 21:12:55 +01:00
Philip Schell	7baee555f4	Add 4th extruder	2015-01-26 21:11:49 +01:00
Philip Schell	cebc7daf2a	Add 4th extruder	2015-01-26 21:10:42 +01:00
Philip Schell	ef4c7abb21	Update language_es.h ... Add 4th extruder	2015-01-26 21:09:24 +01:00
Philip Schell	22e591518a	Update language_de.h ... Add 4th extruder	2015-01-26 21:08:13 +01:00
Philip Schell	a20c35bb38	Update language_ca.h ... Add 4th extruder	2015-01-26 21:04:31 +01:00
Jérémie FRANCOIS	dd301be52d	Added suport for multiline G-code commands in the LCD menus	2015-01-26 18:50:29 +01:00
AnHardt	aa48056c03	Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h	2015-01-26 17:26:22 +01:00
AnHardt	0d219b3e14	Make centering of STRING_SPLASH work	2015-01-26 16:00:10 +01:00
AnHardt	59315330dd	Remove definition of VERSION_STRING and replace where usend with STRING_VERSION	2015-01-26 15:52:01 +01:00
AnHardt	8c792c7b22	Make STRING_VERSION and VERSION_STRING the same	2015-01-26 15:40:44 +01:00
Scott Lahteine	865ca0ef04	Merge pull request #1405 from MagoKimbra/4th-extruders ... All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.	2015-01-25 19:30:51 -08:00
MagoKimbra	3021f7f743	Fix PID_dT ... Add PID_dT in temeprature.cpp	2015-01-25 17:56:14 +01:00
Scott Lahteine	a7b02975b7	No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD ... Pins 2 and 3 are probably general-use pins, since the filament sensor uses pin 2.	2015-01-24 05:10:48 -08:00
Scott Lahteine	6723388f7f	Proposed fix to #1379. Printrboard I2C LCD support	2015-01-24 05:01:02 -08:00
Scott Lahteine	03c9cb60e8	Rename lastnr to autostart_index and... ... Replace instances of the number 13 with FILENAME_LENGTH where appropriate.	2015-01-24 04:57:44 -08:00
MagoKimbra	ef5959a705	Fix Temperature ... Githun insert this line when i merge with actual Branch development...	2015-01-24 13:49:29 +01:00
MagoKimbra	3d4ee6c868	Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders ... Conflicts: Marlin/temperature.cpp	2015-01-24 13:41:15 +01:00
MagoKimbra	986e723eeb	Add 4th extruder	2015-01-24 13:37:58 +01:00
Scott Lahteine	f16bdd2ff2	Borrow from Ultimaker to fix MAX6675 SPI conflict ... Changes to temperature.cpp from Ultimaker fork, intended to address #1226 and #1227	2015-01-24 03:49:15 -08:00
Scott Lahteine	06c3b37933	Formatting cleanup of quiet sources ... Formatting for code-folding plus minor style changes to less active code.	2015-01-23 22:26:52 -08:00
Scott Lahteine	23fcd1ecb2	Merge pull request #1407 from thinkyhead/cleanup_marlinserial ... Formatting cleanup of quiet sources	2015-01-23 21:33:43 -08:00
Scott Lahteine	fd78902194	Formatting cleanup of quiet sources	2015-01-23 21:11:50 -08:00
Scott Lahteine	5c1814383a	Merge pull request #1390 from floyd871/Development ... Show Custom M_Code for Z-Probe Offset when entering M503	2015-01-23 20:08:23 -08:00
MagoKimbra	0ebf896070	Add 4th extruder	2015-01-23 23:13:06 +01:00
Michael Neumann	a9d7ab9530	Update ConfigurationStore.cpp ... Done	2015-01-23 21:05:27 +01:00
Scott Lahteine	3a9a3e5ed8	Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET ... This define is not used.	2015-01-23 10:51:06 -08:00
Scott Lahteine	54d5b52a2e	Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones ... Code wont compile with extruder but without bed runaway protection defined.	2015-01-23 08:36:25 -08:00
Mark Hindess	0ce252ba7a	This ifdef is for bed code so should use bed constants for testing. ... Without this fix, the code wont compile with extruder but without bed runaway protection defined.	2015-01-23 16:30:13 +00:00
Scott Lahteine	9040446780	Merge pull request #1395 from AnHardt/iss1394 ... removed function step_wait() from stepper.cpp	2015-01-23 06:58:10 -08:00
Scott Lahteine	25f79c5010	Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200 ... Add: Board for Vellemann K8200 (derived from 3Drag)	2015-01-23 06:08:38 -08:00
Scott Lahteine	9ce75ab7de	Merge pull request #1386 from roglio/Development ... Fixing a build error for melzi and gfx display	2015-01-23 06:00:24 -08:00
Scott Lahteine	15a00a5a7c	Add 1µs delay in other appropriate spots	2015-01-23 03:24:45 -08:00
AnHardt	23cb899c5a	removed function step_wait() from stepper.cpp ... removed function step_wait() from stepper.cpp because its used nowhere.	2015-01-21 16:30:45 +01:00
Scott Lahteine	d9d4a78e0f	Add proper delay in stepper.cpp ... Issue #1385 describes a delay that the compiler is optimizing out and this solution.	2015-01-21 01:51:29 -08:00
CONSULitAS	d1322dafc9	Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391 ... # Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391 * K8200: new folder in example_configurations for Vellemann K8200 (3Drag clone - should work with 3Drag http://reprap.org/wiki/3drag, too. Please report) * K8200/Configuration.h/Configuration_adv.h: updated manually with parameters form genuine Vellemann Firmware "firmware_k8200_marlinv2" based on the recent development branch I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for Windows (SD library added to IDE manually) - everything works well	2015-01-20 23:13:44 +01:00
CONSULitAS	3b50a5e2e6	Add: Board for Vellemann K8200 (derived from 3Drag) ... ## Add: Board for Vellemann K8200 (derived from 3Drag) * Boards.h: updated comment for board 3Drag - K8200 removed * Boards.h: added `BOARD_K8200` with ID 78 * language.h.: machine name and firmware URL for new board * pins.h: added `K8200` to any `#if` with `3Drag` and corresponding comments	2015-01-20 20:46:20 +01:00
Michael Neumann	2d454da3af	Update ConfigurationStore.cpp ... Show Custom M Code when entering M503	2015-01-20 16:21:44 +01:00
Scott Lahteine	4f35de991a	Merge pull request #1383 from CONSULitAS/Development ... Update Boards.h for Vellemann K8200 - comment only	2015-01-19 15:59:38 -08:00
roglio	22571ca13d	Revert "Configuration for Aurora Z605" ... This reverts commit 935ee968a7.	2015-01-19 15:02:11 +01:00
roglio	935ee968a7	Configuration for Aurora Z605 ... Still not fine tuned but working.	2015-01-19 11:18:52 +01:00
roglio	ccdbeda526	Fixing a build error for melzi and gfx display ... When a melzi board and a full gfx are both selected, the build fails blaming for some missing defines. This is a fix for the issue: now my configuration works.	2015-01-19 10:43:26 +01:00
CONSULitAS	e13f159343	Update Boards.h for Vellemann K8200 - comment only ... ## Update Boards.h for Vellemann K8200 - comment only * Boards.h: updated comment for board 3Drag - K8200 uses same board	2015-01-19 00:53:17 +01:00
CONSULitAS	51c7f2fd5a	Revert "## Add: Example Configuration for Vellemann K8200" ... This reverts commit 5333590ac2.	2015-01-19 00:37:57 +01:00
CONSULitAS	5333590ac2	## Add: Example Configuration for Vellemann K8200 ... * K8200: new folder in example_configurations for Vellemann K8200 (3Drag clone - should work with 3Drag too, please report) * K8200/language.h: updated machine name and URL for K8200 * K8200/Configuration.h/Configuration_adv.h: updated manually with parameters form genuine Vellemann Firmware "firmware_k8200_marlinv2" based on the recent development branch * K8200/files by Vellemann: added folder with original files from Vellemann homepage, since there is no GitHub fork you could link to by them I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for Windows - everything works well	2015-01-19 00:28:55 +01:00
Denis Chertykov	ba3ac40b9d	Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. ... Change default value of AVRDUDE_PROGRAMMER to 'wiring'.	2015-01-18 20:18:43 +03:00
daid	53f971095d	Revert "Reduce PROGMEM warnings"	2015-01-16 16:48:22 +01:00
PxT	67b597ad46	Update printrboard pin assignments ... Backported from Printrbot branch, allows the fan to work correctly.	2015-01-15 19:48:40 -08:00
galexander1	d4880a9e60	Revert "Move Sd library out into library"	2015-01-15 18:52:10 -05:00
Bo Herrmannsen	ccdb086fc8	Merge pull request #1363 from PxT/patch-1 ... Fixes #1361	2015-01-15 10:57:44 +01:00
Bo Herrmannsen	5151db5c2f	Merge pull request #1349 from msutas/patch-2 ... Improvement - G29 Option for Not Retracting Servo	2015-01-15 10:56:31 +01:00
Bo Herrmannsen	1746b2582b	Merge pull request #1332 from Sniffle/Development ... Rambo FAN_PIN documentation and servo support	2015-01-15 10:56:17 +01:00
Bo Herrmannsen	4b51b5a46d	Merge pull request #1357 from odewdney/SDlib ... Move Sd library out into library	2015-01-15 10:56:07 +01:00
Bo Herrmannsen	f2cb4a3655	Merge pull request #1353 from thawkins/Development ... fix avrdude upload in makefile	2015-01-15 10:55:33 +01:00
PxT	9fd4292923	Fixes #1361	2015-01-13 10:59:50 -08:00
odewdney	f84ff4ba7d	Move SD Fat library out of main src	2015-01-13 13:31:55 +00:00
Bo Herrmannsen	ab074dac17	Merge pull request #1344 from grob6000/independent_pid ... Independent PID parameters for each extruder	2015-01-13 12:10:37 +01:00
Bo Herrmannsen	d4a665694a	Merge pull request #1350 from odewdney/Development ... Reduce PROGMEM warnings	2015-01-13 11:26:50 +01:00
odewdney	9d9c859ac1	First move of SdFat library	2015-01-13 08:04:32 +00:00
Tim Hawkins	5045d17a39	fix avrdude upload in makefile	2015-01-13 13:01:43 +08:00
msutas	3a5a6f42fb	Corrected the ABL grid option ... G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.	2015-01-12 11:07:46 +02:00
odewdney	cd55a93a13	re-add blank line	2015-01-11 19:22:35 +00:00
odewdney	23bfe30036	moved include themister to temperature.c	2015-01-11 18:18:32 +00:00
odewdney	538859669d	Removing compiler warnings for progmem	2015-01-11 18:14:21 +00:00
grob6000	bf2c923db5	Make multiple PID parameters a config option ... * Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID parameters to be used where this would be preferable (e.g. dual identical extruders) * When disabled, will use `float Kp, Ki, Kd, Kc;` as before. Preprocessor macros used to switch between. * ultralcd.cpp defines extra menus for extra parameters only where required * M301 reports `e:xx` only if independent pid parameters enabled * EEPROM structure still leaves space for 3 extruders worth, when undef will save single parameter to all extruder positions, but only read the first * Switching off saves approx 330 B with no LCD enabled, 2634B with LCD (RRD) enabled: this is significant. * LCD modifications should be tested.	2015-01-11 13:50:17 +11:00
grob6000	0877aa0fe0	Merge remote-tracking branch 'upstream/Development' into independent_pid	2015-01-11 11:32:58 +11:00
msutas	e0beb98fd3	Improvement - G29 Option for Not Retracting Servo ... This change introduces an improvement to G29 command on Marlin. Auto bed leveling operation's reliability is based on the repeatability of the Z-probe switch and the servo. This change introduces an option to G29 command. When the G29 command is sent with an "e" option, during auto bed levelling the servo is not retracted between probes which decreases the bias on auto bed levelling resulting from servo. G29 command does the auto bed probing as it is. G29 E command engages the servo on first probing point, probes all points and retracts the servo after probing the last point. Please comment your opinions, test on your printer and check the code on a programmer's perspective. (I am not a good programmer.)	2015-01-10 17:25:39 +02:00
grob6000	7d32c7f36d	Multiple PID parameter edit for ultralcd ... * Depending on extruder count, will add menu items for ultralcd to edit individual PID parameters for each extruder * Added menu items to each language_xx.h * Builds OK, but recommend testing with typical LCD	2015-01-11 01:14:02 +11:00
Steffen Vogel	69dc411ae0	Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD ... Conflicts: Marlin/dogm_lcd_implementation.h	2015-01-10 14:57:11 +01:00
grob6000	3e2af67ce3	Fix R-H compatibility ... * R-H reads incorrect M301 line from EEPROM output if more than one is present. Reverted to original output format, using only E0 value.	2015-01-10 16:44:28 +11:00
grob6000	37c7e8300f	Independent PID parameters for each extruder ... * Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS * M301 gains (optional, default=0) E parameter to define which extruder's settings to modify. Tested, works with Repetier Host's EEPROM config window, albeit only reads/updates settings for E0. * All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to 3 extruders supported (same as Marlin in general)	2015-01-10 16:35:12 +11:00
Scott Lahteine	326b925557	DOGLCD and LCD_PROGRESS_BAR to coexist ... Small changes (and formatting to confuse the diff’er) which first allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a #warning (rather than error) that the extra progress bar / message options don’t apply to graphical displays at this time. This leaves open perhaps combining the progress bar and message area in some future (or forked custom) graphical LCD display arrangement (at which time the relevant variables may be moved into ultralcd.cpp with externs in ultralcd.h). I also added a conditional error that the progress bar and the filament display may not work well together.	2015-01-09 18:16:56 -08:00
Erik van der Zalm	1aade4a8e2	Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development	2015-01-09 21:33:29 +01:00
Erik van der Zalm	8a2e84e3f1	Possible fix for FWRETRACT with 0 zlift.	2015-01-09 21:33:02 +01:00
Steffen Vogel	905aab3b85	added missing #endif	2015-01-09 20:23:38 +01:00
Steffen Vogel	b9cf1465a7	updated LCD bouts with new strings and bitmaps ... new version is pretty generic and should work in most scenarios	2015-01-09 18:49:59 +01:00
Steffen Vogel	c7632be5cc	added high and low resolutions version of splash screen logo (saving code size)	2015-01-09 18:49:24 +01:00
Steffen Vogel	8f0dba7cbf	adding string for bouts splash string to config	2015-01-09 18:48:30 +01:00
Bo Herrmannsen	d94109e886	updated logo post and ver info	2015-01-09 15:51:15 +01:00
Bo Herrmannsen	cd33b5b062	changed logo and ver info ... logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round ver info is placed centered and there is a 9 pixel from bottom of display to ver info	2015-01-09 15:44:47 +01:00
Bo Herrmannsen	9b6c1cfda6	removed unneeded lines in welcome msg	2015-01-09 15:20:41 +01:00
Bo Herrmannsen	ffa09f86f4	moved ver info 5 spaces to the right	2015-01-09 13:31:23 +01:00
Alex Borro	2bbb68be8a	Fix calculation of BAL grid fitting into the bed ... The previous calc was wrong. Between N points there are only N-1 gaps, not N. So changing AUTO_BED_LEVELING_GRID_POINTS to (AUTO_BED_LEVELING_GRID_POINTS-1)	2015-01-09 10:17:33 -02:00
Bo Herrmannsen	590caafa2d	changed ver info	2015-01-09 13:17:08 +01:00
Bo Herrmannsen	3bb9b31515	changed boot logo a bit to test if fat wall goes away	2015-01-09 12:51:21 +01:00
Steffen Vogel	da192c521f	Merge pull request #1333 from andrewsil1/development ... Fix grammar/typos in new Configuration.h option	2015-01-08 00:34:01 +01:00
Erik van der Zalm	3a30d45c2e	Revert "issue 968 for dev branch"	2015-01-07 23:40:17 +01:00
andrewsil1	269ec9f87f	Fix grammar/typos in new Configuration.h option ... (For the SLOW_PWM_HEATERS option)	2015-01-07 12:41:09 -08:00
Todd Swindoll	506353892e	Rambo Pin documentation and servo support ... Updated pins reference and servo support. cross referenced between Rambo 1.1, 1.2, and 1.3	2015-01-07 11:02:05 -06:00
Steffen Vogel	8d7bfd03d8	moved/renamed documentation stuff to top-level directory	2015-01-07 15:33:50 +01:00
Bo Herrmannsen	3c9e6b7b62	added link for pic to hex converter	2015-01-07 14:28:51 +01:00
Bo Herrmannsen	0e760274bd	changed reprap logo to marlin logo	2015-01-07 14:27:51 +01:00
Bo Herrmannsen	b291a422e9	added square png version of logo ... 406*406 pixels	2015-01-07 13:00:37 +01:00
Luis E Alvarado	7ae548cf34	Update Marlin Firmware URL	2015-01-07 05:26:47 -06:00
Erik van der Zalm	8f9067faa6	Added marlin logos. (Designed by Ahmet Cem TURAN)	2015-01-07 12:21:16 +01:00
Bo Herrmannsen	addf52fd4a	Merge pull request #1328 from DinoMesina/development ... Some corrections and new features	2015-01-06 23:52:32 +01:00
Dino Del Favero	5cfe13f240	Correct some mistakes	2015-01-06 21:55:08 +01:00
Dino Del Favero	c7e2d73039	Merge branch 'development' ... ok	2015-01-06 20:18:03 +01:00
Alex Borro	422a958a34	Fix CoreXY speed calculation ... For cartesian bots, the X_AXIS is the real X movement and same for Y_AXIS. But for corexy bots, that is not true. The "X_AXIS" and "Y_AXIS" motors (that should be named to A_AXIS and B_AXIS) cannot be used for X and Y length, because A=X+Y and B=X-Y. So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning the real displacement of the Head. Having the real displacement of the head, we can calculate the total movement length and apply the desired speed.	2015-01-06 16:39:48 -02:00
Dino Del Favero	038fccd7a1	I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp. ... There is the possibility of turn on this features adding "#define SLOW_PWM_HEATERS" in Configuration.h	2015-01-06 18:32:17 +01:00
DinoMesina	6730335657	Update Configuration.h	2015-01-06 18:06:02 +01:00
Bo Herrmannsen	4ffecdbf7d	Merge pull request #1313 from wgm4321/Development ... Re-enable filament menu with recalc fix when enabling/disabling mm3	2015-01-06 13:47:49 +01:00
Steffen Vogel	672f764b4d	replaced ASCII GPL v3 license by markdown version ... moved new COPYING file to top-level directory to make it more visible and remove clutter from Marlin subduer	2015-01-06 11:49:05 +01:00
Steffen Vogel	f25e793cff	rename stepper lookup table scipt to be consistent with termistor lookup table script	2015-01-06 10:30:20 +01:00
Steffen Vogel	df17a6a1b4	fix #1305 by proposed workaround (thanks gaby64)	2015-01-06 10:29:26 +01:00
Steffen Vogel	f7e65935fb	make use of power operator	2015-01-06 10:28:43 +01:00
Steffen Vogel	4e02aff9b5	automatically determine min/max temp for terminator	2015-01-06 10:28:19 +01:00
Steffen Vogel	81363bc441	more cleanups	2015-01-06 10:27:40 +01:00
Steffen Vogel	95f4a55820	refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients	2015-01-06 08:24:59 +01:00
Steffen Vogel	21205cc3d8	more cleanups in the termistorTable generation script	2015-01-06 08:23:51 +01:00
Steffen Vogel	fb0996b5db	improved output aligment and precision	2015-01-06 08:20:52 +01:00
Steffen Vogel	538231edfd	cosmetic whitespace cleanup and comments added/updated	2015-01-06 08:20:20 +01:00
wgm4321	067b509479	Re-enable filament menu with recalc fix when enabling/disabling mm3	2015-01-05 22:29:29 -05:00
wgm4321	a19f2f8ae7	Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled	2015-01-04 22:15:16 -05:00
wgm4321	f24dda9700	Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3" ... This reverts commit dd7e4ee97f.	2015-01-04 22:08:41 -05:00
wgm4321	ec4681ab6b	Revert "Add "Detailed Z Probe" menu item with ABL is defined." ... This reverts commit 2b9722f387.	2015-01-04 21:53:37 -05:00
wgm4321	dd7e4ee97f	Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3	2015-01-04 21:44:55 -05:00
wgm4321	2b9722f387	Add "Detailed Z Probe" menu item with ABL is defined.	2015-01-04 21:42:16 -05:00
Dan Royer	9472bbe51d	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.	2015-01-04 12:17:46 -08:00
alexborro	d2b6e62996	Merge pull request #1309 from philfifi/fix_temp_runaway ... temp runaway: proper cast to prevent any overflow.	2015-01-04 12:55:58 -02:00
Philippe L	30248214c7	temp runaway: proper cast to prevent any overflow.	2015-01-04 14:23:31 +01:00
Bo Herrmannsen	c5f138ea07	Merge pull request #1291 from alhirzel/Development ... Define analogInputToDigitalPin only if needed	2015-01-04 12:53:41 +01:00
odewdney	652895d656	try different proproc for CI failure	2015-01-04 11:15:23 +00:00
Bo Herrmannsen	3d9f4ac757	Merge pull request #1303 from wgm4321/Development ... Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...	2015-01-04 01:29:26 +01:00
wgm4321	04fb34c7ff	Add English defines for filament menu to non-English to prevent compile errors until translated	2015-01-03 17:28:05 -05:00
wgm4321	f8aa5ff771	Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined	2015-01-03 17:10:13 -05:00
odewdney	39fae9e3a3	Fix progmem warning ... Borrow code from https://github.com/arduino/Arduino/issues/1793	2015-01-03 21:30:16 +00:00
Alexander Hirzel	f36fd3ddec	Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development	2015-01-02 12:39:39 -05:00
Scott Lahteine	b5e50cdd4e	Move scripts and documentation to subfolders	2015-01-02 08:53:09 -08:00
Alexander Hirzel	eed451e034	rework analogInputToDigitalPin definition	2015-01-02 11:14:20 -05:00
Lane Roberts	1f520a5a8c	Due to the fix for #1248, X and Y probe offsets must not 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.	2015-01-02 11:12:16 -05:00
wgm4321	b32be2dc64	Fix syntax error caused by previous changes.	2015-01-02 11:12:16 -05:00
wgm4321	edac64e7d2	Add Filament menu and add Filament/Retract settings to config store.	2015-01-02 11:12:15 -05:00
Alexander Hirzel	ecda6cdc0a	Fix typo, PID_BED_POWER -> MAX_BED_POWER	2015-01-02 11:12:15 -05:00
David Forrest	f3e503e725	temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.	2015-01-02 11:12:15 -05:00
David Forrest	1d5d853c9a	temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.	2015-01-02 11:12:15 -05:00
Bo Herrmannsen	63da6900b0	Merge pull request #1282 from vandarin/Development ... Due to the fix for #1248, X and Y probe offsets must not be floats.	2015-01-02 15:35:40 +01:00
Bo Herrmannsen	a18b625534	Merge pull request #1261 from wgm4321/Development ... Add Filament menu and add Filament/Retract settings to config store.	2015-01-02 15:35:29 +01:00
Alexander Hirzel	ae12ad0d6c	Fix typo, PID_BED_POWER -> MAX_BED_POWER	2015-01-02 01:38:03 -05:00
alexborro	80b17ab573	Merge pull request #1285 from drf5n/PID_CI_v2 ... temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.	2015-01-01 22:56:21 -02:00
David Forrest	625860f086	temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.	2015-01-01 19:24:42 -05:00
David Forrest	6583bb781d	temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.	2015-01-01 19:11:42 -05:00
Lane Roberts	2701dd8a17	Due to the fix for #1248, X and Y probe offsets must not 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.	2014-12-31 12:34:59 -06:00
Grogyan	6b82415c81	Update pins.h ... Somehow the pin definitions for the MAX6675 Slave Select/Chip Select got changed back to the hardware SPI SS/CS. Pin 49 cannot be used as that is used by the SD card socket to detect if an SD card is present. Pin 53 is the Hardware SPI SS, which is dedicated, nicely, to the SD card SS and therefore cannot be used as the MAX6675 SS Pin 66 is in Aux2 port adjacent to the Hardware SPI interface port on RAMPS 1.4, and is currently not used for anything.	2014-12-31 13:04:16 +13:00
Bo Herrmannsen	692a01b1c7	Merge pull request #1277 from thinkyhead/fix_regressions ... Fix regressions affecting compilation	2014-12-30 16:49:08 +01:00
Scott Lahteine	2ec2bf1564	Fix regressions affecting compilation ... This fixes two regressions, caused by #1167 and #1191 .	2014-12-30 07:36:18 -08:00
Scott Lahteine	e7db8ee9e5	ftostr32np > ftostr32sp ... sp=space-padded, similar to: ns=no-sign	2014-12-30 07:26:25 -08:00
Scott Lahteine	10e1b6ef8b	Least stack-usage self-contained ftostr32np() ... This is the optimal code for a self-contained formatter, although the original code is crafty in being smaller and simpler, and can be evaluated as using the original output as a scratch pad for state, making the final formatter more straightforward. While this code is longer, all code-paths are minimal.	2014-12-30 07:26:25 -08:00
Scott Lahteine	d1f21d1189	As it should be	2014-12-30 07:26:25 -08:00
Scott Lahteine	449dad71f2	Least stack-usage self-contained ftostr32np() ... This is the optimal code for a self-contained formatter, although the original code is crafty in being smaller and simpler, and can be evaluated as using the original output as a scratch pad for state, making the final formatter more straightforward. While this code is longer, all code-paths are minimal.	2014-12-30 07:26:24 -08:00
Scott Lahteine	a2109cb492	Patch to make Z look more like X and Y on UltraLCD	2014-12-30 07:26:24 -08:00
Bernhard Kubicek	3d1da45f3e	Update Marlin.h	2014-12-30 08:30:37 +01:00
bkubicek	d02daec08f	fixed compilation	2014-12-30 08:04:06 +01:00
Caleb Anderson	991a74b75b	Move delta calibration menu to sample delta configuration. ... Turn off by default.	2014-12-29 18:03:56 -07:00
Bo Herrmannsen	67fd8f0727	Merge pull request #1267 from RobotCaleb/LanguageFix ... Language Fix - Using the new language implementation wasn't behaving as expected.	2014-12-29 19:49:11 +01:00
Caleb Anderson	236db44669	Fix spacing	2014-12-29 10:44:55 -07:00
Caleb Anderson	e6774fb7d2	Using the new language implementation wasn't behaving as expected. ... No matter what LANGUAGE_CHOICE was set to it would always take the en branch. I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code. This is an attempt to pull my changes from #1222 over.	2014-12-29 10:43:19 -07:00
Caleb Anderson	cb047e9070	Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)	2014-12-29 10:19:25 -07:00
Caleb Anderson	5b336a4cdb	Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051 ... To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h	2014-12-29 10:13:00 -07:00
Bernhard Kubicek	10ad9f1062	Addes servo0 pin ultimaker	2014-12-29 17:27:14 +01:00
Bernhard Kubicek	f24c5d82e3	Update Marlin_main.cpp ... fixed minor typo	2014-12-29 17:17:30 +01:00
Wurstnase	8a6f098cc6	Expand manage_inactivity #1264 ... void manage_inactivity(bool ignore_stepper_queue=false) standard is false so it is not necessary to change additional code. this change should be better, hopefully nophead like this :)	2014-12-29 17:07:22 +01:00
Wurstnase	d1995aec7a	Rename ignore_blocks_queued ... more speaking name	2014-12-29 16:47:08 +01:00
Wurstnase	4122de9d17	change filament issue ... make a more general solution	2014-12-29 16:31:00 +01:00
wgm4321	d60efc3b5d	Fix syntax error caused by previous changes.	2014-12-28 20:47:59 -05:00
wgm4321	cb12161191	Add Filament menu and add Filament/Retract settings to config store.	2014-12-28 20:43:14 -05:00
fmalpartida	ec33df0554	Merge branch 'SAV-MkI_merge' into Development ... Tested for SAV MKI and SAV 3D LCD on lewihe.	2014-12-28 19:54:06 +01:00
Matthew Schick	0468f81950	Update for pull request #837	2014-12-28 11:22:44 -05:00
Matthew Schick	6e42c9e305	Add fwretract settings to M503 output	2014-12-28 11:22:44 -05:00
alexborro	3afe66bb0c	Fix issues #1248, #1240 ... - Fixed issue when BAL area probing is shorter than it should be for grid probing - Warning when BAL activated with Delta Kinematics - Fix XY_TRAVEL_SPEED when homing Z axis	2014-12-28 13:27:39 -02:00
Lukas Obermann	9eb6df17a7	Consider negative Z Offsets when auto bed leveling is active	2014-12-28 12:46:35 +01:00
Bo Herrmannsen	c9f60183a9	Merge pull request #1233 from NarimaanV/Development ... Fixed BABYSTEPPING feature	2014-12-28 10:13:21 +01:00
Bo Herrmannsen	0d957872a0	Merge pull request #1234 from gregrebholz/issue_1069 ... Fixes #1069. Added "auto fan" checks to PID_autotune.	2014-12-28 10:12:08 +01:00
Bo Herrmannsen	9c07d28bd6	Merge pull request #1249 from drf5n/PID_CI_v2 ... temperature.cpp: Add Conditional Integration to prevent excessive integral windup	2014-12-28 10:09:25 +01:00
Bo Herrmannsen	23e768dffa	Merge pull request #1250 from chertykov/Development ... Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp	2014-12-28 10:09:08 +01:00
Scott Lahteine	2f467e2797	LCD Progress Bar	2014-12-27 22:26:14 -08:00
Denis Chertykov	050ca9ca13	Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp	2014-12-28 09:09:42 +03:00
David Forrest	cf52c48d19	Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX. ... Current defaults are all 255. If it makes sense to reduce them, they should come down together, and be in a PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.	2014-12-27 15:26:09 -05:00
David Forrest	984177c40c	temperature.cpp:Add PID Conditional integration on heated bed.	2014-12-27 15:26:09 -05:00
David Forrest	c9b8435749	heater.c: Limit PID I term with conditional integration.	2014-12-27 15:26:09 -05:00
Greg Rebholz	7ecb7cbd46	Added "auto fan" checks to PID_autotune	2014-12-23 23:50:00 -05:00
NarimaanV	7667949aca	Fixed BABYSTEPPING feature ... Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.	2014-12-23 12:49:54 -05:00
alexborro	d74aabf259	Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"	2014-12-21 10:06:05 -02:00
Bo Herrmannsen	60628864ca	Merge pull request #1167 from thinkyhead/sd_freemem ... Use SdFatUtil::FreeRam() for freeMemory() if there	2014-12-20 18:31:21 +01:00
Bo Herrmannsen	889d7ba218	Merge pull request #1177 from martin-pr/probing_z_speed ... Split do_blocking_move() to XY and Z sections	2014-12-20 18:30:35 +01:00
Bo Herrmannsen	5e7bd2dc87	Merge pull request #1200 from chertykov/Marlin_v1 ... Fix syntax errors in #ifdef	2014-12-20 18:29:39 +01:00
Denis Chertykov	b086394178	Fix syntax errors in #ifdef.	2014-12-20 19:33:43 +03:00
John Davis	39d28a9bbf	Update qr_solve.h ... Changed level to compensation	2014-12-19 17:53:55 -05:00
John Davis	6325968a39	Update qr_solve.cpp ... Changed leveling to compensation	2014-12-19 17:52:13 -05:00
John Davis	e99f24ff2f	Update planner.h ... Changed level and leveling to compensation.	2014-12-19 17:51:14 -05:00
John Davis	ac204028e7	Update planner.cpp ... Changed level and leveling to compensation	2014-12-19 17:49:22 -05:00
John Davis	4315c2547a	Update Marlin_main.cpp ... Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").	2014-12-19 17:41:29 -05:00
John Davis	f21c65918f	Update Servo.h ... Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION	2014-12-19 17:20:09 -05:00
John Davis	58c4473bea	Update Servo.cpp ... Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION	2014-12-19 17:18:55 -05:00
John Davis	825c46024d	Update vector_3.cpp ... Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION	2014-12-19 17:16:31 -05:00
John Davis	cfe80e1def	Update vector_3.h	2014-12-19 17:14:35 -05:00
John Davis	7464d3c96a	Update ConfigurationStore.cpp ... Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION	2014-12-19 17:08:43 -05:00
John Davis	81568c3c6d	Update Configuration.h ... Changed Auto Bed Level to Auto Bed Compensation	2014-12-19 17:06:56 -05:00
Bo Herrmannsen	03e489aaad	Merge pull request #1197 from foosel/fix/issue_1147 ... Fixes commands not being acknowledged in the same order they are received in	2014-12-19 14:39:05 +01:00
Gina Häußge	acc0e75279	Fixes commands not being acknowledged in the same order they are received ... in G0 to G3 were previously acknowledged in the get_command method, causing them to be possibly acknowledged before commands coming after them that were acknowledged in process_commands. This patch fixes this, moving the acknowledgement of G0 to G3 to the process_commands method as well. These commands are therefore no longer acknowledged when the enter the cmd_buffer but instead only acknowledged when the enter the plan_buffer. Guaranteeing that commands are acknowledged in the same order in which they were received by the firmware allows host software to be able to track the life cycle of commands and such a better management of the firmware's serial buffers as well as better internal command processing and response parsing without having to depend on throwing an epic amount of regular expressions against each line received back from the firmware. Fixes ErikZalm/Marlin#1147	2014-12-19 14:20:36 +01:00
daid	17de96ace7	Merge branch 'Marlin_v1' into revert-1154-sd_sorting ... Conflicts: Marlin/cardreader.cpp Marlin/cardreader.h	2014-12-18 23:13:50 +01:00
Scott Lahteine	6880e93b75	Happy configs	2014-12-18 14:02:47 -08:00
Scott Lahteine	3b1f186c0c	Clean up configs	2014-12-18 13:59:31 -08:00
Scott Lahteine	f83d0f2a68	Defines for electronics boards ... Added boards.h which contains defines for all the board numbers, plus some shorthand macros for less typing.	2014-12-18 13:59:31 -08:00
Bo Herrmannsen	bd25e7393b	Merge pull request #1192 from thinkyhead/split_language ... Split up languages.h. Use ISO language codes.	2014-12-18 22:26:55 +01:00
Bo Herrmannsen	174f8d3631	Added example configs for printers from http://tvrrug.org.uk/	2014-12-18 20:34:24 +01:00
Scott Lahteine	e970461adb	Clean up, move unused to the bottom, add headings	2014-12-18 10:33:00 -08:00
Scott Lahteine	0c06e97e98	Split up languages.h, use ISO codes ... Breaking up languages.h makes it easier to translate. Using language codes makes it easier to select a language and sets the naming standard.	2014-12-18 09:31:19 -08:00
Bo Herrmannsen	a9c334e8bc	Merge pull request #1191 from thinkyhead/code_shrink ... Shrink and Optimize	2014-12-18 17:23:11 +01:00
Bo Herrmannsen	842da54e68	Merge pull request #1187 from thinkyhead/fix_constants ... A few constants where they belong	2014-12-18 17:21:46 +01:00
Scott Lahteine	07c6b5ab71	Using axis constants	2014-12-18 08:13:08 -08:00
Scott Lahteine	1857e611d3	Other small tweaks	2014-12-18 07:49:16 -08:00
Scott Lahteine	63e1665fa9	Reduce ultralcd.cpp redundancies	2014-12-18 07:30:05 -08:00
Scott Lahteine	e69313fc2b	Reduce dogm lcd code	2014-12-18 07:03:40 -08:00
Bo Herrmannsen	bd22405412	Merge pull request #1190 from thinkyhead/sd_sorting ... Wrap call to flush_presort	2014-12-18 12:50:55 +01:00
Scott Lahteine	49791949af	Wrap call to flush_presort	2014-12-18 03:47:12 -08:00
Scott Lahteine	0450e83fa5	Use SdFatUtil::FreeRam() for freeMemory() if there	2014-12-17 23:26:52 -08:00
Scott Lahteine	f21cce0b28	Rebase to Marlin_v1	2014-12-17 23:07:36 -08:00
Scott Lahteine	e4b98011cf	And one more...	2014-12-17 23:01:24 -08:00
Scott Lahteine	60598b4cdd	A few constants where they belong	2014-12-17 23:01:24 -08:00
Bo Herrmannsen	280504e2e0	Merge pull request #908 from alromh87/Marlin_v1 ... Support for Gen3 Monolithic electronics	2014-12-17 22:28:07 +01:00
Bo Herrmannsen	31ca3de72f	Merge pull request #819 from neildarlow/Marlin_v1 ... Activate LiquidTWI2 device detection and space-pad LCD status line.	2014-12-17 21:42:53 +01:00
Bo Herrmannsen	e83cfc0a62	Merge pull request #1163 from thinkyhead/lcd_abort_message ... LCD "Abort" Message	2014-12-17 21:30:19 +01:00
Bo Herrmannsen	0b310ab6c5	Merge pull request #1153 from xinfab/negative_values_in_menu ... Negative values in menu	2014-12-17 20:58:01 +01:00
Bo Herrmannsen	91d740e128	Merge pull request #1141 from filipmu/Filament-Sensor ... Display filament sensor data on a 20x4 LCD or Graphical LCD	2014-12-17 20:38:30 +01:00
alexborro	ab355a90d3	Revert "SD Sort and Buffer"	2014-12-17 14:50:59 -02:00
Scott Lahteine	d088b5f30f	Remove debug echo	2014-12-13 06:33:12 -08:00
Scott Lahteine	1fad8e6a81	Proper long file name var	2014-12-13 06:17:00 -08:00
Scott Lahteine	29e854c535	Disable SDCARD_SORT_ALPHA by default ... For legacy boards it’s better if this option is disabled.	2014-12-13 06:12:34 -08:00
Scott Lahteine	6599adc184	Polish up a little...	2014-12-13 06:12:34 -08:00
Scott Lahteine	a12eec33e2	Completed SORT_USES_MORE_RAM implementation ... For the MORE_RAM option we need to buffer both the short and long names, even though long names are sometimes redundant. Worst case, all the names are max length. We can save some RAM by not storing these. We could save more RAM by only storing the visible part of the long name.	2014-12-13 06:12:34 -08:00
Scott Lahteine	c9486ebb85	Improvements, more SORT_USES_MORE_RAM ... With this option, always keeps the dir in RAM, doubling as a cache for getfilename. A board with only 8K of SRAM is cutting it very close.	2014-12-13 06:12:33 -08:00
Scott Lahteine	b6ffea612a	Expand on More RAM concept, address minor bugs	2014-12-13 06:10:44 -08:00
Scott Lahteine	8196b36ad9	SD Card Alpha Sorting ... First iteration of alphabetical sorting for SD cards, both slow+efficient and fast+rammy. Option for folders to sort first, last, or not at all.	2014-12-13 06:07:52 -08:00
Scott Lahteine	cf749dbeda	Completed SORT_USES_MORE_RAM implementation ... For the MORE_RAM option we need to buffer both the short and long names, even though long names are sometimes redundant. Worst case, all the names are max length. We can save some RAM by not storing these. We could save more RAM by only storing the visible part of the long name.	2014-12-13 06:03:39 -08:00
Scott Lahteine	ae081d0fe0	Improvements, more SORT_USES_MORE_RAM ... With this option, always keeps the dir in RAM, doubling as a cache for getfilename. A board with only 8K of SRAM is cutting it very close.	2014-12-13 06:03:39 -08:00
Scott Lahteine	785143a013	Expand on More RAM concept, address minor bugs	2014-12-13 06:03:39 -08:00
Scott Lahteine	0cbbba08bd	SD Card Alpha Sorting ... First iteration of alphabetical sorting for SD cards, both slow+efficient and fast+rammy. Option for folders to sort first, last, or not at all.	2014-12-13 06:03:39 -08:00
Scott Lahteine	3ebfd29312	Print a message when printing is aborted ... Messages in gcode files like “M117 Printing…” were not being cleared on Stop Print.	2014-12-13 06:01:46 -08:00
Martin Prazak	2ef0669b19	Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded	2014-12-07 15:31:46 +00:00
Neil Darlow	64139f5e5a	Merge https://github.com/ErikZalm/Marlin into Marlin_v1	2014-12-04 21:09:03 +00:00
Bo Herrmannsen	edfcf3b527	Toshiba Stepper Driver support ... Tosh stepper drivers need to be driven slower, so the stepper code was interleaved to separate the pin HIGH from the pin LOW. This adds enough instructions to make it work, without needing nops.	2014-12-03 15:01:52 +01:00
Bo Herrmannsen	c429a4b3ec	Toshiba Stepper Driver support ... Tosh stepper drivers need to be driven slower, so the stepper code was interleaved to separate the pin HIGH from the pin LOW. This adds enough instructions to make it work, without needing nops.	2014-12-03 14:37:16 +01:00
nothinman	1977b4490f	Merge pull request #1159 from thinkyhead/lcd_wait_better ... M0/M1 Message Fix	2014-11-28 16:44:29 +00:00
Scott Lahteine	7562183efc	Skip over spaces first	2014-11-28 08:09:28 -08:00
nothinman	5a8b3a84ae	Merge pull request #1155 from thinkyhead/lcd_wait_better ... M0-M1 Enhancements	2014-11-28 11:01:24 +00:00
elgambitero	433ac29d31	Updated a bit of spanish language	2014-11-27 22:02:49 +01:00
Scott Lahteine	12b51d6060	Ignore S and P if no value >0 is included.	2014-11-26 21:05:11 -08:00
Scott Lahteine	d12b24758a	Clear LCD to welcome_msg if not printing ... The welcome message is more appropriate than “resuming print” if nothing is printing.	2014-11-26 21:05:11 -08:00
Scott Lahteine	3f54c9ba33	Relocate click ignore code into info screen	2014-11-26 21:05:10 -08:00
Scott Lahteine	92e21d3ee2	M0-M1 Enhancements ... Allow M0 and M1 to include a message string. Ignore clicks on “Wait for user” so that the Info Screen stays up.	2014-11-26 21:05:10 -08:00
Lionello Lunesu	0d35b1d0b8	Allow negative values in menus	2014-11-25 18:34:02 +08:00
Jonas	0d97dec434	Adaption of LCD info screen ... Here comes a compile-time operation to match the extruder symbols on the info screen to the set number of extruders in configuration.h. When only one extruder is selected, the "1" on the symbol will not be displayed.	2014-11-12 17:10:48 +01:00
Filip Mulier	3b1ab84536	Display Filament Sensor data on graphic LCD ... Added support to show the filament width on the status line of the graphic LCD. The status will show for 5 sec and then switch over to data. Status can be seen by clicking the button.	2014-11-10 21:46:37 -06:00
Filip Mulier	d84934d8c5	Display Filament Sensor data on 20x4 LCD ... Changes to support displaying the real-time filament width and the volume factor on a 20x4 LCD. The data is displayed on the 4th line. First the status message is displayed for 5 seconds, and then the filament data is displayed. The status message can be seen by re-selecting the info screen in the menu.	2014-11-10 21:43:58 -06:00
Filip Mulier	5c8107bcdd	Commented out FILAMENT_SENSOR #define ... Commented out the FILAMENT_SENSOR define so that it is not enabled by default. Code does not work on all hardware variants.	2014-11-09 13:26:02 -06:00
David	377dfb182f	Updated example configurations for Delta printers	2014-11-02 21:04:54 +00:00
Neil Darlow	b81021f475	Merge https://github.com/ErikZalm/Marlin into Marlin_v1	2014-10-21 12:06:56 +01:00
Erik van der Zalm	724197454c	Merge pull request #1104 from ch100/Marlin_v1 ... Fixed typo.	2014-10-11 23:10:00 +02:00
Erik van der Zalm	058e446531	Merge pull request #1037 from filipmu/Filament-Sensor ... Support for a filament diameter sensor	2014-10-11 22:56:01 +02:00
Christian Inci	110c5dcf23	Fixed typo. ... Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>	2014-10-11 00:25:36 +02:00
Matt Stultz	ca30aee903	Fix "add_homeing" to "add_homing" to match changes	2014-10-07 00:16:27 -04:00
Erik van der Zalm	0733825fb1	Merge pull request #1099 from Fourmi/Marlin_v1 ... Update line 627 ,wrong number on thermistortables	2014-10-06 14:36:00 +02:00
Fourmi	af3e4d7510	Update line 627 ,wrong number on thermistortables ... Wrong number on line 627 > i change number "12" by the correct number "13" Soory	2014-10-06 14:21:44 +02:00
Erik van der Zalm	aaaf8fe8dd	Merge pull request #1068 from darkjavi/Marlin_v1 ... Added profile for RAMPS with 2 extruders and 1 fan, no heated bed	2014-10-06 13:41:38 +02:00
Erik van der Zalm	b360306881	Merge pull request #1073 from WingTangWong/wing-fix-float-delta ... Wing fix float delta	2014-10-06 13:41:01 +02:00
Erik van der Zalm	ce85515428	Merge pull request #1082 from Fourmi/Marlin_v1 ... Add thermistor table	2014-10-06 13:39:36 +02:00
Erik van der Zalm	764921bdbf	Merge pull request #1091 from Aldert/patch-1 ... Update motion_control.cpp	2014-10-06 13:37:19 +02:00
Erik van der Zalm	c40c7b589b	Merge pull request #1095 from thinkyhead/codeclean ... Simple code cleanup. Rename "homeing" to homing.	2014-10-06 13:36:48 +02:00
Erik van der Zalm	0f2e0525df	Merge pull request #1096 from thinkyhead/set-home ... Proposed feature: Set Home Offsets	2014-10-06 13:36:11 +02:00
Erik van der Zalm	5ae02a361b	Merge pull request #1097 from thinkyhead/round-up-xyz ... Adjust the Z display to hide float rounding errors	2014-10-06 13:35:00 +02:00
Matthew Schick	fb34265d75	Make hotend optional when compiling with lcd support ... Signed-off-by: Matthew Schick <matthew.schick@gmail.com>	2014-10-06 00:19:07 -04:00
Scott Lahteine	6e343ef2f0	Adjust the Z display to hide float rounding errors	2014-10-05 18:34:54 -07:00
Scott Lahteine	2f6c57eadc	Proposed feature: Set Home Offsets ... Add an item to the LCD menu that applies the current axis position to the “add_homeing” offset.	2014-10-05 13:35:45 -07:00
Scott Lahteine	f989bd5435	Simple code cleanup. Rename "homeing" to homing.	2014-10-05 13:20:53 -07:00
Neil Darlow	6c5a460e65	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-10-05 12:54:54 +01:00
Aldert	d1e4237e1d	Update motion_control.cpp ... G03 Full circle did not work (G02 is working correct)	2014-10-04 09:24:09 +02:00
Fourmi	a664763e6f	Update thermistortables.h ... Add another thermistor table (13),it's a cartridge thermistor up to +300°C,use with Hotend "Simple ONE" & "All In ONE" Thx	2014-09-27 09:05:10 +02:00
Fourmi	b5dc228a7a	Update configuration.h ... Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"	2014-09-27 09:02:58 +02:00
Fourmi	3cbb2f56c6	Update configuration.h ... Add another comment on configuration.h for the value of thermistor. I make a pull request on thermistortables.h with my thermistor (12),but y see there is a comment on configuration with number 12 but it's not present on thermistortables.h ? Thx	2014-09-26 22:01:06 +02:00
Fourmi	c35736a140	Update thermistortables.h ... Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"	2014-09-26 21:49:07 +02:00
galexander1	cb4a6dd2dc	Merge pull request #1065 from oliasmage/Marlin_v1 ... Corrected retract() call for use of auto probe without sled enabled.	2014-09-19 15:12:09 -04:00
Bracken Dawson	01e9b536cb	Fix build for non-sled bed auto levelling ... This function should only be used with sled, not all bed auto levelling.	2014-09-19 19:42:32 +01:00
Wing Tang Wong	58eabd21fb	Added ifndef	2014-09-16 14:31:58 -07:00
Wing Tang Wong	88d12a762a	Added #ifndef DELTA wrapper to float delta	2014-09-16 14:29:44 -07:00
alexborro	bf0ecedf60	Merge pull request #1051 from fsantini/EZ_fix935 ... Fix issue 935: error in matrix calculation	2014-09-14 21:49:15 -03:00
Javi	40ba644bb4	Added profile for RAMPS with 2 extruders and 1 fan. ... modified: Marlin/Configuration.h modified: Marlin/pins.h	2014-09-06 02:53:36 +02:00
Charles Bell	3b8216bdd1	Corrected #endif and ifdef for Z_PROBE_SLED code.	2014-09-04 16:40:22 -04:00
Charles Bell	37799f70ba	Corrected retract() call for use of auto probe without sled enabled.	2014-09-04 14:36:39 -04:00
Neil Darlow	1632e5e38a	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-09-04 12:21:35 +01:00
Filip Mulier	fe3a09bbcf	Correct analog sampling time for additional A to D sample ... Adjusted the #define PID_dT to reflect 10 A to D sample steps, vs original 8.	2014-09-01 06:26:19 -05:00
Gina Häußge	1e9dc85148	Do not use translations for the serial console messages ... The serial protocol has to stay machine readable, without having to cope with a ton of different human language variants. So just leave it at the original english version. Should fix ErikZalm/Marlin#1052	2014-08-29 18:02:59 +02:00
fsantini	cf325ba240	Fix issue 935: error in matrix calculation	2014-08-28 21:10:50 +02:00
Erik van der Zalm	018b68a5c4	Merge pull request #976 from cocktailyogi/SCARA_by_Yogi ... Implemented SCARA-Maths	2014-08-28 16:32:52 +02:00
Erik van der Zalm	dde61d8886	Merge pull request #977 from OskarLinde/Marlin_v1 ... Fix lcd itostr3() to handle negative numbers	2014-08-28 16:31:53 +02:00
Erik van der Zalm	0fbfb1bf82	Merge pull request #991 from bonm014/patch-1 ... Leapfrog controller board support	2014-08-28 16:27:52 +02:00
Erik van der Zalm	8340ca6e05	Merge pull request #992 from Grogyan/patch-1 ... temperature.cpp fixes for SD card and MAX6675	2014-08-28 16:27:14 +02:00
Erik van der Zalm	9887555192	Merge pull request #998 from darconeous/pull-requests/fwretract ... FWRETRACT fixes	2014-08-28 16:24:51 +02:00
Erik van der Zalm	105571ec68	Merge pull request #1005 from midopple/Marlin_v1 ... With option DISABLE_INACTIVE_EXTRUDER the extruder is disable to early	2014-08-28 16:24:14 +02:00
Erik van der Zalm	68dd5e635e	Merge pull request #1024 from oliasmage/Marlin_v1 ... Adding Z Probe via sled mounted endstop	2014-08-28 16:15:54 +02:00
Erik van der Zalm	25069ed4e9	Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults ... Z probe repeatability with correct defaults	2014-08-28 16:14:10 +02:00
Filip Mulier	75b3a68b65	Revert "Change pinMode to SET_INPUT or SET_OUTPUT" ... This reverts commit 1d0fe035f3.	2014-08-16 13:26:48 -05:00
Filip Mulier	e3c88a5120	Filament sensor changes to config file ... Update the config file for improvements and clarifying what diameter to use in the slicer software.	2014-08-16 07:08:09 -05:00
Filip Mulier	62db9848d3	Improvements and bug fixes in sensor delay buffer for filament sensor code ... Improvement to avoid reinitializing delay buffer with every print. Fixed issues in buffer indexing and memory out of bounds due to floating point imprecision. Simplified the code by avoiding conversion to standard diameter and 1cu mm extrusion, which caused complications in determining mm extruded.	2014-08-16 06:50:13 -05:00
Florian Baumann	5908fd5cec	Fix reseting CHDK pin to LOW ... chdkActive was set to false regardless of (millis() - chdkHigh) being bigger than the CHDK_DELAY or not. So if (millis() - chdkHigh) wasn't bigger than the delay the first time, the CHDK would never be set back to LOW. Also, don't return from the function, as there might be other stuff to do, after the CHDK check.	2014-08-11 14:12:32 +02:00
Roxy-3DPrintBoard	0adbc79571	Fix Default Configuration so Auto Bed Leveling is off ... This snapshot has the Auto Bed Leveling turned off because most Marlin users do not have that feature.	2014-08-10 10:18:54 -05:00
Roxy-3DPrintBoard	0091865583	Z_PROBE_REPEATABILITY test ... Z_PROBE_REPEATABILITY test for Auto Bed Leveling. Implemented as M48 with extra user specified options. Full support at http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code	2014-08-09 15:37:23 -05:00
Filip Mulier	85649a4549	Real-time filament diameter measurement and control ... This feature allows the printer to read the filament diameter automatically and adjust the printer in real time. Added code to read an analog voltage that represents a filament diameter measurement. This measurement is delayed in a ring buffer to compensate for sensors that are a distance away from the extruder. The measurement is used to adjust the volumetric_multiplier for the extruder. Some additional g codes (M404, M405, M406, M407) are used to set parameters and turn on/off the control. g code M221 is updated. Pins for RAMPS1.4, RAMBO, and Printrboard are identified for analog input. The configuration file is updated with relevant user parameters.	2014-08-06 19:30:57 -05:00
Filip Mulier	1d0fe035f3	Change pinMode to SET_INPUT or SET_OUTPUT ... Original code is using WRITE from fastio, but original used pinMode to set pin direction and did not use the fastio SET_INPUT or SET_OUTPUT. This caused an issue with the rotary encoder interface to boards based on teensyduino, since for teensyduino pin numbers for fastio and the usual Arduino IO are different.	2014-08-04 21:44:04 -05:00
Charles Bell	e7707aedbc	Commented out new #defines in Configuration.h.	2014-08-04 10:18:25 -04:00
Charles Bell	0a8dc0e96b	Added documentation to the README.md for the sled Z probe option. CAB	2014-08-04 10:07:43 -04:00
Charles Bell	d2fcb3ee56	CAB: Added code for Z-probe with Z endstop mounted on a sled.	2014-08-01 11:29:59 -04:00
Neil Darlow	3cd7dbcc45	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-07-30 13:01:52 +01:00
daid	c13a831ea1	Merge pull request #1017 from foosel/fix/checksum_truncation_bug ... Fix for a wrong checksum truncation for certain commands	2014-07-24 19:41:34 +02:00
Gina Häußge	2d22902d08	Fix for a wrong checksum truncation for certain commands ... Positioning of string terminator to truncate checksum from the commands M23, M28, M30, M32, M928 and M117 was off by one, causing the last letter of the actual command to be truncated instead of just the checksum. In case of the SD commands this caused checksummed commands targeting existing files to fail since the last letter of the filename was truncated. In case of M117 this caused the last given letter not to be displayed. This patch fixes the off-by-one error and sets the null terminator on the exact position of the * starting the checksum instead of the character before that.	2014-07-24 12:04:02 +02:00
cocktailyogi	ad3b770c1a	updated examples	2014-07-20 13:55:13 +02:00
cocktailyogi	2f4a20257c	imported last Marlin changes	2014-07-20 13:49:26 +02:00
daid	aacff0d361	Merge pull request #948 from Dim3nsioneer/Marlin_v1 ... Implementation of FW extruder change retract	2014-07-18 16:10:15 +02:00
midopple	17aa67e4ea	If the option DISABLE_INACTIVE_EXTRUDER ist active the extruder switch to early to inactive because there are some moves in the buffer. So the planner wait 32 moves to disable the unused extruder.	2014-07-13 21:52:32 +02:00
Robert Quattlebaum	1fd9a7d476	Fix for FWRETRACT on DELTA printers. ... Fixes #817	2014-07-09 09:24:26 -07:00
Neil Darlow	3f2c771d90	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-07-07 18:17:15 +01:00
Grogyan	bcd039aa81	Update pins.h	2014-07-05 17:55:03 +12:00
Grogyan	82606354dd	Update temperature.cpp ... Enables both SD card and MAX6675 to talk with each other Fixes also issue #750	2014-07-05 17:17:17 +12:00
bonm014	32a6451ad8	Add leapfrog and dual Y/Z ... I have added the pin set for the leapfrog and the support of dual Y and Z	2014-07-03 21:15:03 +02:00
bonm014	b5417be109	Update Configuration.h ... Leapfrog added to the board list	2014-07-03 21:03:22 +02:00
bonm014	f244045245	Update pins.h ... Leapfrog board added to the pin list	2014-07-03 21:01:41 +02:00
Pablo Clemente	2242a84218	Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965	2014-07-01 16:45:03 +02:00
Neil Darlow	6e3406d228	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-07-01 10:27:39 +01:00
alexborro	43c298a7a9	Add "Thermal Runaway Protection" feature ... This is a feature to protect your printer from burn up in flames if it has a thermistor coming off place (this happened to a friend of mine recently and motivated me writing this feature). The issue: If a thermistor come off, it will read a lower temperature than actual. The system will turn the heater on forever, burning up the filament and anything else around. After the temperature reaches the target for the first time, this feature will start measuring for how long the current temperature stays below the target minus _HYSTERESIS (set_temperature - THERMAL_RUNAWAY_PROTECTION_HYSTERESIS). If it stays longer than _PERIOD, it means the thermistor temperature cannot catch up with the target, so something *may be* wrong. Then, to be on the safe side, the system will he halt. Bear in mind the count down will just start AFTER the first time the thermistor temperature is over the target, so you will have no problem if your extruder heater takes 2 minutes to hit the target on heating.	2014-06-30 15:22:49 -03:00
Pablo Clemente	d86c3cf43c	Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.	2014-06-30 15:12:13 +02:00
cocktailyogi	f0cab611db	optimised some math-code	2014-06-24 18:43:36 +02:00
Oskar Linde	269a068032	Fix lcd itostr3() to handle negative numbers	2014-06-24 14:31:15 +02:00
cocktailyogi	fae7d08698	fixed wrong compiler-option	2014-06-23 18:16:42 +02:00
cocktailyogi	512f2a3136	restore Branch from Backup ... sorry for that	2014-06-23 17:09:57 +02:00
Pablo Clemente	cd3220d055	Inverted state logic for forced_heating_stop variable	2014-06-13 08:39:58 +02:00
Pablo Clemente	86b4b805d2	Fixed stop print LCD function on M104	2014-06-12 18:43:16 +02:00
Greg Tan	6e6e4e2143	Added thermistor table for the 500C thermistor shipped with the Pico hot end.	2014-06-08 09:35:04 +08:00
Neil Darlow	9d11b70436	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-06-07 20:48:25 +01:00
Gina Häußge	0de826160e	M30 response is missing linefeed, "ok" therefore not on own line ... This leads to the command not being acknowledged properly by the firmware, leading to consecutive issues in host software waiting for an acknowledgement.	2014-06-02 17:11:32 +02:00
Dim3nsioneer	3c927901a4	Implementation of FW extruder change retract ... FW retraction is extended onto swap retraction invoked by 'G10 S1'. Bookkeeping of the retract state of all extruders allows for having one extruder fw standard retracted while another extruder is swap retracted. An LCD menu item for the swap retract and recover length was added.	2014-06-02 17:02:10 +02:00
Dim3nsioneer	8a32c5395b	renaming the disable inactive extruder feature	2014-06-02 14:07:02 +02:00
Dim3nsioneer	29e7639933	Add switch unused feeder(s) off ... Having the non-active feeder motors powered on all the time is not necessary. A feature to deactivate the unused feeder motors has been implemented. The feature is enabled on default but can be switched off in the configuration.	2014-06-02 08:13:09 +02:00
Justin Nesselrotte	07c0eeee99	Fixed a comment in the planner	2014-06-01 19:04:41 -05:00
David Forrest	09b84faa00	Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0	2014-05-29 17:19:16 -04:00
neildarlow	efb6d61413	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-05-24 13:08:58 +01:00
nothinman	38192cb5f3	Add M112 description to Marlin_main	2014-05-20 15:20:19 +01:00
nothinman	aed5ec008a	Merge pull request #851 from DanNixon/estop ... Implemented M112	2014-05-19 17:55:34 +01:00
Erik van der Zalm	cfb98ef682	More coverity fixes	2014-05-15 22:09:50 +02:00
zaubara	92e14298b0	Fixes typo for lcd backlighting on I2C PCF8575 ... When using LCD_I2C_TYPE_PCF8575T (like Sainsmart I2C), the backlight won't come on; the incorrect ifdef blocks the evocation of the backlight functions.	2014-05-15 01:37:23 +02:00
Erik van der Zalm	9db9842aea	Fixed error found by the free coverity tool (https://scan.coverity.com/) ... =================================================== Hi, Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan. Defect(s) Reported-by: Coverity Scan Showing 15 of 15 defect(s) ** CID 59629: Unchecked return value (CHECKED_RETURN) /Marlin_main.cpp: 2154 in process_commands()() ** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT) /Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)() ** CID 59631: Missing break in switch (MISSING_BREAK) /Marlin_main.cpp: 1187 in process_commands()() ** CID 59632: Missing break in switch (MISSING_BREAK) /Marlin_main.cpp: 1193 in process_commands()() ** CID 59633: Out-of-bounds write (OVERRUN) /temperature.cpp: 914 in disable_heater()() ** CID 59634: Out-of-bounds write (OVERRUN) /temperature.cpp: 913 in disable_heater()() ** CID 59635: Out-of-bounds read (OVERRUN) /temperature.cpp: 626 in analog2temp(int, unsigned char)() ** CID 59636: Out-of-bounds read (OVERRUN) /temperature.cpp: 620 in analog2temp(int, unsigned char)() ** CID 59637: Out-of-bounds write (OVERRUN) /temperature.cpp: 202 in PID_autotune(float, int, int)() ** CID 59638: Out-of-bounds read (OVERRUN) /temperature.cpp: 214 in PID_autotune(float, int, int)() ** CID 59639: Out-of-bounds write (OVERRUN) /Marlin_main.cpp: 2278 in process_commands()() ** CID 59640: Out-of-bounds read (OVERRUN) /Marlin_main.cpp: 1802 in process_commands()() ** CID 59641: Uninitialized scalar field (UNINIT_CTOR) /Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)() ** CID 59642: Uninitialized scalar field (UNINIT_CTOR) /Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)() ** CID 59643: Uninitialized scalar field (UNINIT_CTOR) /Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)() ________________________________________________________________________________________________________ *** CID 59629: Unchecked return value (CHECKED_RETURN) /Marlin_main.cpp: 2154 in process_commands()() 2148 } 2149 #endif 2150 } 2151 } 2152 break; 2153 case 85: // M85 CID 59629: Unchecked return value (CHECKED_RETURN) Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times). 2154 code_seen('S'); 2155 max_inactive_time = code_value() * 1000; 2156 break; 2157 case 92: // M92 2158 for(int8_t i=0; i < NUM_AXIS; i++) 2159 { ________________________________________________________________________________________________________ *** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT) /Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)() 313 else 314 { 315 // two choices for the 16 bit timers: ck/1 or ck/64 316 ocr = F_CPU / frequency / 2 - 1; 317 318 prescalarbits = 0b001; CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT) "ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if. 319 if (ocr > 0xffff) 320 { 321 ocr = F_CPU / frequency / 2 / 64 - 1; 322 prescalarbits = 0b011; 323 } 324 ________________________________________________________________________________________________________ *** CID 59631: Missing break in switch (MISSING_BREAK) /Marlin_main.cpp: 1187 in process_commands()() 1181 case 2: // G2 - CW ARC 1182 if(Stopped == false) { 1183 get_arc_coordinates(); 1184 prepare_arc_move(true); 1185 return; 1186 } CID 59631: Missing break in switch (MISSING_BREAK) The above case falls through to this one. 1187 case 3: // G3 - CCW ARC 1188 if(Stopped == false) { 1189 get_arc_coordinates(); 1190 prepare_arc_move(false); 1191 return; 1192 } ________________________________________________________________________________________________________ *** CID 59632: Missing break in switch (MISSING_BREAK) /Marlin_main.cpp: 1193 in process_commands()() 1187 case 3: // G3 - CCW ARC 1188 if(Stopped == false) { 1189 get_arc_coordinates(); 1190 prepare_arc_move(false); 1191 return; 1192 } CID 59632: Missing break in switch (MISSING_BREAK) The above case falls through to this one. 1193 case 4: // G4 dwell 1194 LCD_MESSAGEPGM(MSG_DWELL); 1195 codenum = 0; 1196 if(code_seen('P')) codenum = code_value(); // milliseconds to wait 1197 if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait 1198 ________________________________________________________________________________________________________ *** CID 59633: Out-of-bounds write (OVERRUN) /temperature.cpp: 914 in disable_heater()() 908 WRITE(HEATER_0_PIN,LOW); 909 #endif 910 #endif 911 912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1 913 target_temperature[1]=0; CID 59633: Out-of-bounds write (OVERRUN) Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1". 914 soft_pwm[1]=0; 915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1 916 WRITE(HEATER_1_PIN,LOW); 917 #endif 918 #endif 919 ________________________________________________________________________________________________________ *** CID 59634: Out-of-bounds write (OVERRUN) /temperature.cpp: 913 in disable_heater()() 907 #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1 908 WRITE(HEATER_0_PIN,LOW); 909 #endif 910 #endif 911 912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1 CID 59634: Out-of-bounds write (OVERRUN) Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1". 913 target_temperature[1]=0; 914 soft_pwm[1]=0; 915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1 916 WRITE(HEATER_1_PIN,LOW); 917 #endif 918 #endif ________________________________________________________________________________________________________ *** CID 59635: Out-of-bounds read (OVERRUN) /temperature.cpp: 626 in analog2temp(int, unsigned char)() 620 if(heater_ttbl_map[e] != NULL) 621 { 622 float celsius = 0; 623 uint8_t i; 624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]); 625 CID 59635: Out-of-bounds read (OVERRUN) Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1). 626 for (i=1; i<heater_ttbllen_map[e]; i++) 627 { 628 if (PGM_RD_W((*tt)[i][0]) > raw) 629 { 630 celsius = PGM_RD_W((*tt)[i-1][1]) + 631 (raw - PGM_RD_W((*tt)[i-1][0])) * ________________________________________________________________________________________________________ *** CID 59636: Out-of-bounds read (OVERRUN) /temperature.cpp: 620 in analog2temp(int, unsigned char)() 614 if (e == 0) 615 { 616 return 0.25 * raw; 617 } 618 #endif 619 CID 59636: Out-of-bounds read (OVERRUN) Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1). 620 if(heater_ttbl_map[e] != NULL) 621 { 622 float celsius = 0; 623 uint8_t i; 624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]); 625 ________________________________________________________________________________________________________ *** CID 59637: Out-of-bounds write (OVERRUN) /temperature.cpp: 202 in PID_autotune(float, int, int)() 196 { 197 soft_pwm_bed = (MAX_BED_POWER)/2; 198 bias = d = (MAX_BED_POWER)/2; 199 } 200 else 201 { CID 59637: Out-of-bounds write (OVERRUN) Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1). 202 soft_pwm[extruder] = (PID_MAX)/2; 203 bias = d = (PID_MAX)/2; 204 } 205 206 207 ________________________________________________________________________________________________________ *** CID 59638: Out-of-bounds read (OVERRUN) /temperature.cpp: 214 in PID_autotune(float, int, int)() 208 209 for(;;) { 210 211 if(temp_meas_ready == true) { // temp sample ready 212 updateTemperaturesFromRawValues(); 213 CID 59638: Out-of-bounds read (OVERRUN) Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1). 214 input = (extruder<0)?current_temperature_bed:current_temperature[extruder]; 215 216 max=max(max,input); 217 min=min(min,input); 218 if(heating == true && input > temp) { 219 if(millis() - t2 > 5000) { ________________________________________________________________________________________________________ *** CID 59639: Out-of-bounds write (OVERRUN) /Marlin_main.cpp: 2278 in process_commands()() 2272 tmp_extruder = code_value(); 2273 if(tmp_extruder >= EXTRUDERS) { 2274 SERIAL_ECHO_START; 2275 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER); 2276 } 2277 } CID 59639: Out-of-bounds write (OVERRUN) Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1). 2278 volumetric_multiplier[tmp_extruder] = 1 / area; 2279 } 2280 break; 2281 case 201: // M201 2282 for(int8_t i=0; i < NUM_AXIS; i++) 2283 { ________________________________________________________________________________________________________ *** CID 59640: Out-of-bounds read (OVERRUN) /Marlin_main.cpp: 1802 in process_commands()() 1796 int pin_status = code_value(); 1797 int pin_number = LED_PIN; 1798 if (code_seen('P') && pin_status >= 0 && pin_status <= 255) 1799 pin_number = code_value(); 1800 for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++) 1801 { CID 59640: Out-of-bounds read (OVERRUN) Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55). 1802 if (sensitive_pins[i] == pin_number) 1803 { 1804 pin_number = -1; 1805 break; 1806 } 1807 } ________________________________________________________________________________________________________ *** CID 59641: Uninitialized scalar field (UNINIT_CTOR) /Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)() 45 } 46 47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable, 48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3) 49 { 50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0); CID 59641: Uninitialized scalar field (UNINIT_CTOR) Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls. 51 } 52 53 void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable, 54 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3, 55 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7) 56 { ________________________________________________________________________________________________________ *** CID 59642: Uninitialized scalar field (UNINIT_CTOR) /Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)() 39 } 40 41 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable, 42 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3) 43 { 44 init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0); CID 59642: Uninitialized scalar field (UNINIT_CTOR) Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls. 45 } 46 47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable, 48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3) 49 { 50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0); ________________________________________________________________________________________________________ *** CID 59643: Uninitialized scalar field (UNINIT_CTOR) /Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)() 26 27 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable, 28 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3, 29 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7) 30 { 31 init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7); CID 59643: Uninitialized scalar field (UNINIT_CTOR) Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls. 32 } 33 34 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable, 35 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3, 36 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7) 37 { ________________________________________________________________________________________________________ To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview	2014-05-14 21:59:48 +02:00
Neil Darlow	e541323741	Merge https://github.com/ErikZalm/Marlin into Marlin_v1	2014-05-09 15:02:50 +01:00
Alejandro Romero	1c9a70cee9	Support for Gen3 Monolithic electronics ... Techzone Monotronics support, ignoring the tip manager and using fan connector as on Sprinter FW TODO: Add support for tipmanager	2014-05-06 19:24:20 -05:00
daid	2acd3792fc	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2014-05-01 12:03:47 +02:00
daid	8b4c4aa5c3	Add feature to check&retry CRC read errors on SD.	2014-05-01 12:03:41 +02:00
nothinman	ce76843dc3	Merge pull request #897 from Makible/5DPrint_D8_Board_Support ... 5DPrint D8 Controller Board Support	2014-04-28 22:11:28 +01:00
Cameron Lai	ad5c8cbba9	Add safety limit for hot bed power in example configuration	2014-04-25 17:04:24 +08:00
Cameron Lai	6460709d92	Fix bug in PID Autotune report	2014-04-25 16:05:05 +08:00
Cameron Lai	105bebb466	Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used	2014-04-25 12:57:47 +08:00
Cameron Lai	97ead2eccb	Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used	2014-04-25 12:57:11 +08:00
Cameron Lai	d85411f13a	Revert "Fix for stepper microstepping" ... This reverts commit eea3ba5588.	2014-04-25 12:41:56 +08:00
Cameron Lai	7c7f2d094e	Revert "Fix for reading microstepping resolution" ... This reverts commit 2715f6ddbf.	2014-04-25 12:41:48 +08:00
Cameron Lai	e2d703377a	Enable EEPROM by default for 5DPrint D8 Controller Board in example configuration	2014-04-24 19:15:35 +08:00
Cameron Lai	2715f6ddbf	Fix for reading microstepping resolution	2014-04-24 17:48:33 +08:00
Cameron Lai	39e9b133f3	Add example configuration for Makibox printer, which uses the 5DPrint D8 Driver Board	2014-04-24 17:06:07 +08:00
Cameron Lai	da6b536182	Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed	2014-04-24 16:49:42 +08:00
Cameron Lai	3a8e36f19e	Add Digipot config for 5DPrint D8 Driver Board	2014-04-24 12:56:46 +08:00
Cameron Lai	eea3ba5588	Fix for stepper microstepping	2014-04-24 12:56:06 +08:00
Cameron Lai	1cbcbb0971	Add makibox machine information	2014-04-24 12:55:21 +08:00
Cameron Lai	2fa514e88a	Add port for 5DPrint D8 Driver board	2014-04-24 12:55:00 +08:00
nothinman	b9126ab497	Merge pull request #894 from MyMakibox/Marlin_v1 ... Update Marlin_main.cpp	2014-04-23 16:23:56 +01:00
MyMakibox	21ec6b88c3	Update Marlin_main.cpp ... Added description of autotemp flags to M109	2014-04-23 17:33:26 +08:00
MyMakibox	e4dc80d3d3	Update Configuration_adv.h ... Corrected error in AUTOTEMP instructions	2014-04-23 17:30:07 +08:00
Neil Darlow	6adbdf42e0	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-04-21 15:10:57 +01:00
whosawhatsis	27d544ac25	Speed up QUICK_HOME feedrate for diagonal move ... Speed up the diagonal move while still keeping each individual axis at or below its homing feedrate.	2014-04-19 17:29:20 -07:00
nothinman	013793bbe9	Merge pull request #878 from koldoartola/Marlin_v1 ... Added new language (Basque-Euskera)	2014-04-13 22:37:39 +01:00
koldo artola	e5b70237c7	Added new language (Basque-Euskera) ... Added: * new language (Basque-Euskera) * some minor corrections for Spanish * added 2 new constants for every language (required for a minor change I am preparing to ultralcd.cpp)	2014-04-13 22:19:38 +02:00
Nutz95	ed6f4a71c5	fix wrong temptable index	2014-04-13 18:00:55 +02:00
Nutz95	3161740df9	This table is made for thermistor 3950 (can be found on ebay for cheap) ... it's caracteristics are : R25℃ ;100KΩ±1% B Value(R25/50℃)：3990K 1% Dissipation Factor(mW/℃)：1.1~1.6 In still Air Thermal Time Constant(S)：10~17 In Still Air Operating temperature range： (-50~+260°C) Dimension： 1.8mm Dia X4.1mm Lead Length ：30mm This table was found on the following blogs: http://cae2100.wordpress.com/2014/03/08/beta3950-thermistor-table-for-marlin/ and http://microfabricator.com/articles/view/id/531ad7e59aad9d3131000000/beta-3950-thermistor-table-for-marlin	2014-04-13 17:03:20 +02:00
nothinman	086ff1644f	Merge pull request #852 from pixatintes/patch-1 ... Update language.h	2014-04-13 00:46:17 +01:00
nothinman	3ffc9651b1	Merge pull request #845 from DerSchultze/Sanguinololu-servo ... Added servo pin assignments to Sanguinololu	2014-04-13 00:37:28 +01:00
nothinman	357b87b498	Merge pull request #826 from paciotti/patch-1 ... Configuration_adv.h	2014-04-13 00:22:25 +01:00
neildarlow	95ad6ec9a1	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-04-12 22:20:45 +01:00
Gabe Rosenhouse	27a7cf9fcf	use existing strings	2014-04-07 05:01:48 -05:00
Gabe Rosenhouse	d3f305332a	Allowable range now includes default value	2014-04-06 19:45:56 -05:00
Gabe Rosenhouse	b0aeac117f	Adjustable Z probe offset, via custom M-code	2014-04-06 19:45:56 -05:00
Neil Darlow	73b380d8d2	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-04-06 19:15:29 +01:00
nothinman	c23376f2e7	Merge pull request #837 from whosawhatsis/fwretract ... FWRETRACT in mm/s	2014-04-04 11:47:58 +01:00
nothinman	dfb98101e4	Change CONTROLLERFAN_PIN for board 35 to -1, as it would conflict with board's 33 extruder pin, causing burnout (it's the same board, just different number of fans/extruders, therefore should be pin-compatible)	2014-04-03 18:05:48 +01:00
nothinman	f1501317ca	Merge pull request #860 from drf5n/therm3950 ... thermistortables.h: Add comments that table 60 uses beta=3950.	2014-04-02 18:29:57 +01:00
nothinman	9a5d23d96f	Merge pull request #866 from sakunamary/Marlin_v1 ... fix bug for dual extruders not working	2014-04-02 18:27:42 +01:00
nothinman	303ee67896	Merge pull request #864 from whosawhatsis/M200 ... fix bug in M200 with multiple extruders	2014-04-02 18:26:15 +01:00
Tim	8759508319	fix bug for dual extruders not working ... some guy find that marlin not working good for dual extruders delta . when type T0 or T1 to active extruder and E0 or E1 move causing XYZ motion . so i locales the bugs and fix it , I have dry run the fix.	2014-04-01 09:26:19 +08:00
whosawhatsis	a65564eef6	fix bug in M200 with multiple extruders	2014-03-30 11:42:22 -07:00
whosawhatsis	aeaf9b9312	fix bug in M200 with multiple extruders	2014-03-30 11:41:57 -07:00
Neil Darlow	89f78b0b80	Allow use of either SD Card slot when LCD Panel is configured. ... Preference is for Controller SD slot before LCD Panel slot when both are occupied.	2014-03-27 17:02:17 +00:00
David Forrest	b0093a1513	thermistortables.h: Add comments that table 60 uses beta=3950.	2014-03-26 23:41:10 -04:00
pixatintes	a3530d1141	Update language.h ... Updated to latest version.	2014-03-23 18:06:48 +01:00
pixatintes	990e770e15	Update language.h ... Added catalan language	2014-03-23 10:30:08 +01:00
Dan Nixon	f643f4d674	Test and refactor	2014-03-21 20:42:00 +00:00
neildarlow	bbe8fbe13d	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2014-03-21 18:27:14 +00:00
Dim3nsioneer	c8cdd1fc6f	Bugfixes for language option 6 (russian)	2014-03-19 14:27:38 +01:00
Dim3nsioneer	7395dafc1e	semantic changes in language.h	2014-03-19 12:30:50 +01:00
Dim3nsioneer	fad2a60ce6	Corrections for preheat extension in language.h	2014-03-19 12:23:35 +01:00
Ralf Schultz	eecda434fb	Sanguinololu servo pins set default disabled	2014-03-18 08:25:20 +01:00
Dim3nsioneer	944ced87c5	Extended Preheat options ... Preheat LCD menus base on code by D-Base	2014-03-17 18:37:46 +01:00
Ralf Schultz	06709ad60e	Added servo pin assignments to Sanguinololu	2014-03-17 15:45:13 +01:00
Dim3nsioneer	3906f27c46	Individual extruder flow rate ... Extension of M221, Tune menu	2014-03-15 18:09:46 +01:00
Dan Nixon	a38c90ee84	Added estop handling	2014-03-15 15:56:15 +00:00
ErikZalm	a00cec8b71	Merge pull request #833 from mattsch/optional_feedrate_multiplier ... Add support for disabling encoder control for feedrate multiplier	2014-03-15 15:41:45 +01:00
neildarlow	af8be9013b	Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1	2014-03-15 07:24:47 +00:00
whosawhatsis	0ddee3c7db	Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection	2014-03-14 18:46:25 -07:00
Dan Nixon	272072fa20	Added M112	2014-03-14 23:19:43 +00:00
whosawhatsis	aab61e63c3	FWRETRACT in mm/s ... Firmware retraction now stores the retract and recover speeds in mm/s instead of mm/min. This makes it match the units of the maximum feedrate, and fixes problems with modifying the value via LCD control panel. From gcode, the values are still taken in mm/min to match the units of G1 and similar, and they are converted to mm/s before they are stored. I also lowered the default retract feedrate to make it less likely to cause problems for geared extruders when the user hasn’t bothered to set a reasonable maximum feedrate, though users should be setting both of these values to suit their hardware.	2014-03-14 15:17:28 -07:00
Matthew Schick	6cd85e6008	Add support for disabling encoder control for feedrate multiplier ... Signed-off-by: Matthew Schick <matthew.schick@gmail.com>	2014-03-12 18:13:50 -04:00
blddk	09af1b90b8	Added CHDK support ... Added CHDK support to take pictures instead of doing an IR command, see more about how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/	2014-03-10 21:57:08 +01:00
blddk	765b2da3d4	Added CHDK support ... Added so M240 can be used to trigger CHDK instead of sending an IR signal, see more about CHDK here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/	2014-03-10 21:52:33 +01:00
paciotti	881e348eed	Update Configuration_adv.h ... Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.	2014-03-08 22:35:05 +01:00
neildarlow	5a332df47e	Merge https://github.com/ErikZalm/Marlin into Marlin_v1	2014-03-06 20:56:44 +00:00
Tommi Lamberg	15d1b8d719	Fixed finnish translation ... - Fixed Few finnish transalations - Removed duplicate contrast define	2014-03-05 14:02:52 +02:00
neildarlow	7325d7102e	Activate LiquidTWI2 device detection and space-pad LCD status line.	2014-03-03 21:01:27 +00:00
ErikZalm	7f76a0e064	Merge pull request #813 from drf5n/PID_DEBUG ... temperature.cpp: Fix PID_DEBUG compile error.	2014-02-26 17:31:48 +01:00
Erik van der Zalm	fcd8524b6e	Only increase EEPROM version for DELTA printers.	2014-02-26 17:29:27 +01:00
Jim Morris	8ea5665ee2	Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration ... Conflicts: Marlin/Marlin_main.cpp	2014-02-26 00:19:28 -08:00
David Forrest	8c4377dd63	temperature.cpp: Fix PID_DEBUG compile error.	2014-02-26 00:44:22 -05:00
ErikZalm	fde8c2c310	Merge pull request #807 from Cylindric3D/typofixes_upstream5 ... Various typo fixes #5 - only in comments, no code changes.	2014-02-25 18:49:41 +01:00
Cylindric	fdce91192e	Various typo fixes - only in comments, no code changes.	2014-02-25 10:01:15 +00:00
Cylindric	d819c55395	Various typo fixes - only in comments, no code changes.	2014-02-25 09:52:58 +00:00
ErikZalm	fd4542f33a	Merge pull request #805 from whosawhatsis/M200 ... autretract fix	2014-02-24 22:35:08 +01:00
ErikZalm	e8291ed728	Merge pull request #802 from Makers-Tool-Works/Marlin_v1 ... Clarify which PID values to enter	2014-02-24 22:31:13 +01:00
ErikZalm	465b654d24	Merge pull request #797 from Cylindric3D/update_menu_plan ... Update menu plan	2014-02-24 22:30:19 +01:00
ErikZalm	88506a80c3	Merge pull request #789 from smiler/Marlin_v1 ... Fixed typo.	2014-02-24 22:26:31 +01:00
ErikZalm	b514d3c87f	Merge pull request #781 from Cylindric3D/typofixes_upstream ... Various typo fixes #3 - only in comments, no code changes.	2014-02-24 22:25:38 +01:00
whosawhatsis	77df0d689a	autretract fix ... I made these changes previously, but I can’t find the commit now. This reapplies the changes to get auto retract working again. Conflicts: Marlin/Configuration_adv.h Marlin/Marlin_main.cpp	2014-02-24 13:24:38 -08:00
ErikZalm	cc5f1d475c	Merge pull request #772 from ellensp/Marlin_v1 ... Updated gen3+ board pins names to current convention	2014-02-24 22:22:15 +01:00
Cylindric	91759dede6	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-24 17:29:37 +00:00
Cylindric	557217fc05	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan	2014-02-24 17:29:24 +00:00
RoyOnWheels	aee63afccd	Clarify which PID values to enter ... Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it. New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h" Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"	2014-02-23 14:36:50 -08:00
Gabe Rosenhouse	99f6326544	Remove unnecessary dependency on time.h from qr_solve.cpp ... Fixed compiler errors on Ubuntu using arduino-core	2014-02-20 16:43:37 -08:00
Cylindric	ea669cb504	Fix some extra and some missing tabs, to make the file consistent.	2014-02-20 14:28:29 +00:00
Cylindric	b46a1b6360	Update the menu plan document with the current menu as per ultralcd.cpp.	2014-02-20 14:20:27 +00:00
Cylindric	3cc7626d1f	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan	2014-02-20 14:12:10 +00:00
Gabe Rosenhouse	174b8d99d5	Simplify 3-point probing using new code only	2014-02-19 21:48:05 -08:00
Gabe Rosenhouse	3b718b816c	better documentation	2014-02-19 14:04:37 -08:00
Gabe Rosenhouse	34fd59c370	ABL at any points	2014-02-19 13:18:21 -08:00
Cylindric	541155ea87	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-19 15:52:18 +00:00
alexborro	9fa328e5c8	Merge pull request #793 from MissionSt/use_axis_enums ... Use constants instead of numeric literals	2014-02-19 10:15:57 -03:00
Gabe Rosenhouse	f308a8af91	update comment	2014-02-19 01:06:24 -08:00
Gabe Rosenhouse	357e31270a	Prevent G29 without first homing in X and Y ... If position is unknown, then G29 can be dangerous.	2014-02-19 00:51:43 -08:00
Gabe Rosenhouse	d2d7d186b5	Use descriptive constants, more	2014-02-19 00:10:17 -08:00
Gabe Rosenhouse	2ccdf4f36d	Use descriptive constants instead of numeric literals	2014-02-19 00:02:59 -08:00
Christian Axelsson	c00383f286	Fixed typo.	2014-02-18 18:50:12 +01:00
Cylindric	60f72a78a9	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-18 17:31:58 +00:00
nothinman	abba7a0003	Merge pull request #782 from marcovannoord/Marlin_v1 ... Added dutch to language.h	2014-02-18 16:19:50 +00:00
Cylindric	b868d668fa	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-18 12:11:01 +00:00
Marco	8212d8d543	Revert "Fixed small typo that would prevent compiling" ... This reverts commit 51ae4881ab.	2014-02-18 10:40:25 +01:00
daid	46bae30573	Merge pull request #776 from whosawhatsis/fwretract ... Fwretract fixes, cleanup	2014-02-18 10:39:28 +01:00
Marco	51ae4881ab	Fixed small typo that would prevent compiling	2014-02-18 09:47:36 +01:00
Marco	498d76fd79	Fixed some messages where the text shown on the screen was more than 17 characters	2014-02-18 09:40:10 +01:00
Jim Morris	af9395ac2e	Add M605 to dynamically set delta configuration ... Save above configs in eeprom fix docs in createTemperatureLookupMarlin.py add missing azteegX3pro digipot settings in delta example config	2014-02-17 20:50:59 -08:00
nothinman	fd42f0d226	Merge pull request #783 from MissionSt/fix/syntax-error ... Fix compile error	2014-02-17 20:59:43 +00:00
nothinman	96217bf36a	Merge pull request #777 from PxT/M114 ... Add whitespace to M114 output	2014-02-17 18:07:47 +00:00
Marco	cf5c3b6610	Added dutch to language.h	2014-02-17 17:00:50 +01:00
Gabe Rosenhouse	d1c64b9dc4	Fix syntax error introduced in 477b6fa1d	2014-02-17 07:56:19 -08:00
Cylindric	5d50819791	Various typo fixes - only in comments, no code changes.	2014-02-17 13:04:44 +00:00
nothinman	3f455889d0	Merge pull request #769 from Cylindric3D/typofixes_1 ... Various typo fixes - only in comments, no code changes.	2014-02-17 11:30:01 +00:00
nothinman	4ddedb3b27	Merge pull request #780 from Cylindric3D/typofixes_2 ... Various typo fixes #2 - only in comments, no code changes.	2014-02-17 11:29:18 +00:00
nothinman	d4ba23bc28	Merge pull request #770 from josefpavlik/Marlin_v1 ... Marlin v1	2014-02-17 11:27:05 +00:00
nothinman	bbb424bd2f	Merge pull request #779 from MissionSt/makefile-fix-abl ... Makefile fixes	2014-02-17 11:22:34 +00:00
Cylindric	8f0cee2a14	Various typo fixes - only in comments, no code changes.	2014-02-17 10:58:36 +00:00
Cylindric	08263ae66e	Merge branch 'Marlin_v1' into typofixes_1	2014-02-17 10:28:20 +00:00
Gabe Rosenhouse	5bd09d26e2	Makefile works with auto bed leveling	2014-02-16 23:23:29 -08:00
Gabe Rosenhouse	b45beeffd6	typo fix in Makefile	2014-02-16 23:23:29 -08:00
Paul Telford	306588925d	Add whitespace to M114 output	2014-02-16 21:01:19 -08:00
whosawhatsis	c43838bb1e	disable auto retract by default ... This should make it safe to enable FWRETRACT by default, with autoretract (which should now be fixed) only enabled by M209. FWRETRACT should probably now default to enabled (to make G10/G11 and M207-209 available, without changing functionality when they are not used), but I’ll save that for another pull request/discussion.	2014-02-16 19:04:54 -08:00
whosawhatsis	99f0e44864	Move FWRETRACT defaults to configuration_adv.h	2014-02-16 19:00:28 -08:00
whosawhatsis	66e3869138	Fix autoretract ... This takes the (now working) G10/G11 code and moves it to a function, which is called by G10 and G11, and also called by G1 if autoretract is enabled and a retract/recover move is detected.	2014-02-16 18:59:04 -08:00
whosawhatsis	2f2459c0db	Fix G10/G11 Z-lift	2014-02-16 18:15:34 -08:00
Gabe Rosenhouse	8c5675c290	Use language.h instead of English literals for "bed"	2014-02-16 17:16:00 -08:00
Gabe Rosenhouse	0f7393a13e	Refactor 'accurate' auto bed leveling to use probe_pt()	2014-02-16 10:44:15 -08:00
Gabe Rosenhouse	c4fbb44d6d	Refactor 3-point auto bed leveling to use probe_pt()	2014-02-16 10:44:08 -08:00
Gabe Rosenhouse	ad2c6488c7	Add probe_pt(), useful for auto bed leveling	2014-02-16 10:38:29 -08:00
Peter	c9c83a4560	Updated gen3+ board pins names to current convention	2014-02-16 00:47:06 +13:00
Mark Hanford	ab0d3c4fb3	Various typo fixes - only in comments, no code changes.	2014-02-14 11:48:24 +00:00
Josef Pavlik	477b6fa1df	move engaged from lcd console refreshes power off timeout	2014-02-14 12:37:21 +01:00
Josef Pavlik	831fc2a952	Pt100 and Pt1000 temperature sensors handling	2014-02-14 12:26:27 +01:00
nothinman	7dcd350941	A few changes to Russian, changed LCD strings to be <=17 characters.	2014-02-13 11:58:14 +00:00
daid	c31bb2b7ad	Only show the ZProbe offset when auto-bed-leveling is enabled.	2014-02-13 11:48:55 +01:00
daid	46f5bea19f	Add configurable beep for UltiPanel.	2014-02-13 11:17:33 +01:00
daid	d16a770855	Ultimainboard 2.x does not has a PS_ON pin.	2014-02-13 10:57:03 +01:00
daid	71bb3a8133	Add comments for Ultimainboard 2.0 configuration.	2014-02-13 10:53:46 +01:00
daid	9b7d87e885	Remove duplicate contrast define.	2014-02-13 10:50:17 +01:00
daid	816f0a678a	Merge pull request #768 from whosawhatsis/Marlin_v1 ... multiple FWretract fixes	2014-02-13 09:14:57 +01:00
whosawhatsis	6e43398509	G10/G11 bugfixes ... Previous version was broken by using G92 E0 between retract and recover.	2014-02-12 13:03:00 -08:00
whosawhatsis	d6c5c503d4	correct feedrate units in comments for M207/M208	2014-02-12 13:02:47 -08:00
nothinman	15d6116188	Merge pull request #689 from cajun-rat/tidy ... Use C++ initialization list	2014-02-12 16:38:11 +00:00
Martin Lukasik	0b9ecf3824	Language cleanup, part 1.	2014-02-12 13:21:26 +00:00
whosawhatsis	b5ba5c1465	Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1	2014-02-11 19:06:03 -08:00
whosawhatsis	78e7654601	Keep FWRETRACT values in terms of millimeters when using M200 ... for volumetric E units	2014-02-11 19:05:35 -08:00
whosawhatsis	3f6d44d40b	Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units	2014-02-11 18:50:11 -08:00
Cylindric	363dc2f0e8	Merge branch 'Marlin_v1' into update_menu_plan	2014-02-12 00:51:16 +00:00
nothinman	5f797ca29f	Updated Polish, changed default firmware URL to Marlin.	2014-02-11 22:38:01 +00:00
Mark Hanford	0778f5f028	Add missing entries to the new Aragonian language.	2014-02-11 14:40:53 +00:00
Mark Hanford	54bab3e0d0	Merge branch 'Marlin_v1' into localisation ... Conflicts: Marlin/language.h	2014-02-11 14:35:28 +00:00
Mark Hanford	bdd0211aeb	Move strings in ultralcd.cpp into language.h.	2014-02-11 13:54:43 +00:00
Daniel Martinez	c8e5a82d49	keep English as default lang.	2014-02-09 18:24:24 +01:00
Daniel Martinez	f64592e362	Add Aragonese translation	2014-02-09 18:19:37 +01:00
ErikZalm	ac74f45dc0	Merge pull request #752 from MatixYo/patch-3 ... Update language.h	2014-02-09 17:52:26 +01:00
MatixYo	36086d3ca4	Update language.h ... Updated Polish translations.	2014-02-07 19:15:51 +01:00
Cylindric	1781031f2d	Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.	2014-02-07 01:52:44 +00:00
Jim Morris	d485988bec	fix typo	2014-02-05 14:39:45 -08:00
Jim Morris	8a1fd25363	Default is to not define digipot_i2c	2014-02-05 14:28:23 -08:00
Jim Morris	5097c57d3a	Added pins for Azteeg X3 Pro under motherboard 68	2014-02-05 14:25:42 -08:00
Jim Morris	b819fc53ca	Add Azteeg X3 Pro as motherboard 68 ... Add digipot i2c control for MCP4451 Allow M907 to set i2c digipot currents in amps Fix Makefile to allow Azteeg motherboards Fix Makefile to allow Wire libraries only Add beeper pin for Azteeg X3 Pro	2014-02-05 01:47:12 -08:00
ErikZalm	e1ae7952eb	Merge pull request #743 from Opticalworm/Marlin_v1 ... Improved support for panelolu2 encoder and buzzer	2014-02-03 12:33:10 -08:00
David Forrest	a5f53f0cf3	Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS	2014-02-03 14:50:28 -05:00
Ronald	8d162e5bd7	Improved support for panelolu2 encoder and buzzer ... I added #define for LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS which is used to alter the default buzzer sound. When selecting Panelolu2 in configuration.h: - it automatically sets the correct ENCODER_PULSES_PER_STEP and ENCODER_STEPS_PER_MENU_ITEM. - if LCD_USE_I2C_BUZZER is defined it will also set the default LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS When selecting the sanguinololu 1284p the following is true: - its now enables LARGE_FLASH - It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is defined	2014-02-03 07:45:03 +00:00
whosawhatsis	b2c11ba980	Change diameter code to 'D' ... For some reason that I can’t figure out, the decimal is dropped when using ’S’ for the code. Also some minor code improvements to M200.	2014-02-01 18:49:25 -08:00
ErikZalm	61059385a3	Merge pull request #737 from whosawhatsis/M200 ... M200 implementation	2014-02-01 10:37:49 -08:00
whosawhatsis	856edfcc0d	Fixed math ... This is why I wanted to sleep on the code I wrote while falling asleep rather than immediately submitting a pull request.	2014-01-31 08:43:11 -08:00
ErikZalm	0d81ae77bc	Merge pull request #727 from drf5n/oversampling ... temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.	2014-01-31 07:09:10 -08:00
ErikZalm	84df13f7d1	Merge pull request #721 from drf5n/lcdOnly ... Enable basic ULTRA_LCD screen w/o encoders and menus.	2014-01-31 07:07:12 -08:00
ErikZalm	4c7e9502ad	Merge pull request #718 from drf5n/temptableRes ... createTemperatureLookupMarlin.py: Add resolution comments and format for...	2014-01-31 07:06:02 -08:00
ErikZalm	652a0f6b5a	Merge pull request #717 from drf5n/tpins2 ... fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...	2014-01-31 07:05:20 -08:00
ErikZalm	96a0cdc541	Merge pull request #716 from drf5n/maketeensy ... Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...	2014-01-31 07:04:29 -08:00
whosawhatsis	d24df7af2c	M200 implementation	2014-01-31 00:54:19 -08:00
David Forrest	f0b8d5ba3d	createTemperatureLookupMarlin.py: Change comment to refer to actual program name.	2014-01-29 23:34:22 -05:00
David Forrest	50f44d9249	createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution.	2014-01-29 23:24:07 -05:00
David Forrest	f5b5dd8038	createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients.	2014-01-29 22:59:47 -05:00
David Forrest	76cf07c3f7	Configuration.h: Use OVERSAMPLENR in dT_PID definition.	2014-01-21 23:25:51 -05:00
David Forrest	476c7193d8	temperature.cpp: Use OVERSAMPLENR in oversampling calculation.	2014-01-21 16:49:03 -05:00
whosawhatsis	f08bb8bb6a	Previous commit borked.	2014-01-19 22:06:45 -08:00
whosawhatsis	b1f8f492c6	Remove previous_millis_cmd update from extruder runout prevention code ... This seems to defeat the purpose of previous_millis_cmd, preventing the time elapsed from previous_millis_cmd from ever reaching max_inactive_time or stepper_inactive_time while the heat was on.	2014-01-19 19:22:08 -08:00
whosawhatsis	8a5eaa3c9b	Fix crash after home bug ... Fixes a bug in the Extruder Runout Prevention feature that caused the extruder to move back to “current_position” after a move if it was activated while the move was in progress. For long home moves (which are longer than the dimensions of the machine’s working area), this would cause the machine to crash into the far end of its travel after homing. This usually occurred on the Z axis, which could result in damage to the machine if you don’t hit the reset button in time.	2014-01-19 19:11:51 -08:00
David Forrest	61a7256d42	Enable basic ULTRA_LCD screen w/o encoders and menus.	2014-01-17 17:00:47 -05:00
l.lefebvre	fdac8f6cec	Update ConfigurationStore.cpp ... Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).	2014-01-17 16:09:58 +01:00
Alex Borro	05932e4458	Add Z Probe Offset to EEPROM and Ultra LCD	2014-01-16 18:13:46 -02:00
David Forrest	7216583b8b	createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin.	2014-01-16 12:40:15 -05:00
David Forrest	e8e0697e48	fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility.	2014-01-16 11:23:29 -05:00
David Forrest	75f39fadfc	Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84})	2014-01-16 10:58:35 -05:00
daid	df194f75e1	Added PT100 support for Ultiboard2	2014-01-06 11:20:03 +01:00
daid	380144c20f	Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original.	2014-01-06 11:05:02 +01:00
fsantini	6ae7f7870d	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp	2013-12-23 12:20:32 +01:00
Phil Wise	17d6d965dc	Use C++ initialization list ... This is the recommended approach for object initialization. The change doesn't affect binary size (although in theory it could make it smaller).	2013-12-19 21:21:46 +00:00
Joseivaldo Benito Junior	ce8b9c4fc5	Correct missing parameter from last upmerge ... Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>	2013-12-19 00:50:44 -02:00
Joseivaldo Benito Junior	8e48e24c7f	Update Delta example files ... Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>	2013-12-18 00:04:36 -02:00
ErikZalm	46d2443c7d	Merge pull request #676 from IVI053/Marlin_v1 ... Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS	2013-12-17 02:28:28 -08:00
-	eed053dffb	Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs" ... This reverts commit b7eadb9f37.	2013-12-16 12:22:06 +01:00
Erik van der Zalm	8349fc89a4	Fixed planner bug	2013-12-16 11:40:23 +01:00
Francesco Santini	da2a6f9a31	Accurate bed leveling: x loop inside y and zigzag motion	2013-12-13 10:31:19 +01:00
RicardoGA	d29615dc0c	Z and Y dual stepper drivers error ... if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware to solve this problem i change this line: #ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS to: #if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS) now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS	2013-12-11 14:37:43 -06:00
fsantini	5bde7fcb28	Minor code and comment polishing	2013-12-11 21:27:43 +01:00
-	20faff5935	Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry	2013-12-08 21:35:57 +01:00
-	e5d3044801	Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability	2013-12-08 21:34:56 +01:00
-	b7eadb9f37	Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs	2013-12-08 21:30:42 +01:00
Michal Dyntar	e8786bf110	Added support for Cheaptronic v1 electronic	2013-12-07 13:29:47 +01:00
fsantini	cc2925b705	Implemented a least squares fit of the bed equation for auto bed leveling. ... The code for the LSQ solver (qr_solve) is copyrighted by John Burkardt and released under LGPL here: http://people.sc.fsu.edu/~%20jburkardt/c_src/qr_solve/qr_solve.html (see qr_solve.cpp for further copyright information)	2013-12-06 21:46:25 +01:00
fsantini	b64661070e	Fixed the plane vector equation to a simpler one (only dependent on the normal) ... Removed the calculation of the inverse matrix since the rotation matrix is orthogonal, therefore inverted == transposed. Much simpler and mathematically robust.	2013-12-06 21:32:21 +01:00
Alex Borro	5c44f6c434	Bed Heater monitoring in Controller Fan ... In some cases the Bed Heater FET heats up more then stepper drivers, so this change add the bed monitoring to the controller fan. As soon as the bed heater is turned on, the controller fan will run as well.	2013-11-27 23:23:06 -02:00
Alex Borro	b33375d438	Z Axis Safe Homing when using Z Probe ... Recommended for those who are using the Z Probe for Z Homing (as Z-Endstop) This feature has two changes: 1) Allow user to choose where the Z Probe will touch the bed when homing all axis together (G28) by setting below defines: Z_SAFE_HOMING_X_POINT Z_SAFE_HOMING_Y_POINT 2) Prevents the user to perform Z Axis Homing when the Z Probe is outsite bed.	2013-11-27 22:37:35 -02:00
Alex Borro	35905ea4f9	Allow heaters to stay full On when PWM=127 ... In previous version, even with PWM = 127, the system turns the FET off and then on in the next cycle. This bevavior may increase the FET heat dissipation. It was fixed keeping the FET always On when PWM=127.	2013-11-27 18:13:38 -02:00
Erik van der Zalm	a94e588765	Changed slow buttons behavior.	2013-11-17 17:41:30 +01:00
Erik van der Zalm	69af392554	Added HEATERS_PARALLEL (Request from reifsnyderb) ... This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.	2013-11-17 13:29:02 +01:00
Erik van der Zalm	48a185d004	Fixed compile errors from bad commits.	2013-11-10 16:36:37 +01:00
ErikZalm	24d1f480b6	Merge pull request #647 from shaggythesheep/newfeature-M226 ... Implement M226 - GCode Initiated Pause	2013-11-10 07:27:01 -08:00
ErikZalm	95b41413e6	Merge pull request #641 from hugokernel/master ... M80 - ATX Power On related modification	2013-11-10 07:26:35 -08:00
ErikZalm	59b96e323e	Merge pull request #640 from fmalpartida/SAV-MkI ... Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD	2013-11-10 07:26:08 -08:00
ErikZalm	2433ee6fc8	Merge pull request #637 from justuswilhelm/Marlin_v1 ... Fix servo control for Melzi v2.0	2013-11-10 07:22:12 -08:00
ErikZalm	3455a2bac2	Merge pull request #636 from PrintToPeer/Marlin_v1 ... Add UUID support to M115 responses.	2013-11-10 07:21:46 -08:00
Richard Miles	dc887ef99b	Implement M226 - GCode Initiated Pause ... Implemented M226 as described here: http://reprap.org/wiki/G-code#M226:_Gcode_Initiated_Pause Waits for pin to be become either HIGH, LOW or the inverse of what it was before. Allows printing to pause until user interaction	2013-11-09 15:11:58 +00:00
Charles R	c244eb860c	If you have a switch on suicide pin, this is useful if you want to ... start another print with suicide feature after a print without suicide...	2013-11-04 12:04:04 +01:00
fmalpartida	7b556d2e96	Added BT support on AT90USB devices ... Added AT90USB device BT connectivity support using second UART.	2013-11-03 19:57:06 +01:00
Kaz Walker	a5e8575829	Add UUID support to M115 responses.	2013-11-01 14:51:50 -06:00
Daniel Benamy	cab84e0e5b	Add (correct) missing pin definitions for Y2 ... I tested this and it works.	2013-10-30 22:44:20 -04:00
fmalpartida	5b3f60ea2e	Corrected LCD only error ... If only an LCD is defined and no menu or keyboard defined, there is a compilation error. Added conditional compilation.	2013-10-30 21:52:46 +01:00
Justus Perlwitz	62d0b79023	Fix servo control for Melzi	2013-10-30 20:59:58 +01:00
fmalpartida	b5a964fcc5	Initial SAV MkI (RepRap CloneWars board) integration. ... Included support for BT dongle on AT90USB boards. Added LCD Shift Register LCD control Included support for RepRap Clone Wars project board (SAV MKI).	2013-10-30 11:45:32 +01:00
dumle29	f941203172	PS_ON configurable boot state ... Allows the user to select wheter or not the PSU should be turned on or kept in standby when marlin boots	2013-10-29 18:44:56 +01:00
whosawhatsis	c79e3967b3	Make G11 not horribly broken	2013-10-24 18:58:42 -07:00
bkubicek	d69822ed51	Fix '#' ... since it can occure in comments.	2013-10-22 10:34:51 +02:00
bkubicek	2fb2a0a119	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2013-10-22 10:08:21 +02:00
bkubicek	39d88bcccb	preparation for hibernation ... If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print. this file could be read, to continue a previously stopped print. not finished yet.	2013-10-22 10:04:08 +02:00
bkubicek	ab965376ff	Sub-file calls. ... by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level. This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file. Another usecase would be to have macro-files for nozzle-change and layerchange. I have not tested the speedwise performance. The testing was done with pronterface. syntax: normal call from sd card will open the new file and continue executing there. M32 !/path/filename# this however will call the new file and return to the caller file. M32 P !/path/filename# with the optional "S<position>" the file starting position can be set. this is for continuing prints from a previous location.	2013-10-22 10:02:18 +02:00
bkubicek	b2cc27e5ea	Added a magic character for sd buffering. ... if a '#' is read now the buffer will be emptied before reading ahead. This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file. # can not occure in sd files imho, because it should only occure within checksums in ther serial communication. Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type on a keyboard manually.	2013-10-22 09:54:13 +02:00
Erik van der Zalm	8a08cca0f2	Added temperature status less. ... Hopefully fixed viky button handling without braking other boards	2013-10-20 12:12:35 +02:00
Erik van der Zalm	667d278f54	Revert "Fix for Viki display" ... This reverts commit 314fd13c39.	2013-10-20 10:16:46 +02:00
Erik van der Zalm	bf27e79e74	Small BlinkM fix	2013-10-20 10:06:02 +02:00
Erik van der Zalm	87e28c0599	Added ifdefs to blinkm	2013-10-20 09:55:15 +02:00
Erik van der Zalm	24c6b2ab35	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2013-10-20 09:51:58 +02:00
ErikZalm	6a803ba9c5	Merge pull request #590 from timkoster/Marlin_v1 ... Added BlinkM support over i2c	2013-10-20 00:51:35 -07:00
Erik van der Zalm	457d8a0acb	Fixed merge conflicts	2013-10-20 09:50:27 +02:00
Alex Borro	6f85a8c7aa	Bed auto Leveling change: Raise Z before homing ... - Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance before homing. This is useful to avoid Z-Probe collision when hotend is near bed. - Fixed the issue of Z not going bellow Z_PROBE_OFFSET when "min_software_endstops" is true. Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after homing.	2013-10-12 17:28:11 -03:00
Alex Borro	dd3086d3f2	Show Temperature ADC values ... If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105 command will present, after tradicional temperatures, the ADC value read from temp sensors. This is great for adjusting thermistor tables with thermocouple. From Pronterface you can see the ADC value and compare with a thermocouple reading.. then you just need to create your own thermistor table. Since this merge doesnt change the original information, it doesnt mess with PC software parsing (tested under Pronterface and Repetier-Host).	2013-10-12 10:41:23 -03:00
bkubicek	7fad13a1e2	Reverse SD card file name order. ... This is _not_ automatically the cronological, since deleting a file will free the filesystem descriptor for it, which then will be used by the next file copied on it. Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu. this should satisfy https://github.com/ErikZalm/Marlin/pull/373 as a reminder, auto0.g will be executed every time after a boot with sd card present and file present. thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating. I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one. It for me 100% replaces any start.gcode form the slicers.	2013-10-12 13:24:55 +02:00
bkubicek	b832f5b9f6	added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try. ... also, removed some trouble for compilation with corexy. I think that babystepping is only possible in z for a delta tower. not sure if it would be usefull to step individual motors on a delta, i don't own one	2013-10-07 09:14:04 +02:00
bkubicek	c38b0855c8	I think that filament change is ready for the masses. I have tested very often with my ultimaker. ... I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.	2013-10-06 21:20:26 +02:00
bkubicek	d147a057ac	Add the socalled "Babystepping" feature. ... It is a realtime control over the head position via the LCD menu system that works _while_ printing. Using it, one can e.g. tune the z-position in realtime, while printing the first layer. Also, lost steps can be manually added/removed, but thats not the prime feature. Stuff is placed into the Tune->Babystep * It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then. Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name. say goodby to fuddling around with the z-axis.	2013-10-06 21:14:51 +02:00
Erik van der Zalm	bca353cc12	Fixed duplicate define in fastio.h	2013-10-03 19:24:53 +02:00
Alex Borro	253dfc4bc1	Bed Auto Leveling feature ... Check the Readme for instruction how to enable and configure the feature	2013-09-29 13:20:06 -03:00
ErikZalm	1bda6bf862	Merge pull request #609 from phq1910/patch-1 ... Update Configuration.h	2013-09-26 11:47:58 -07:00
ErikZalm	c80aac1518	Merge pull request #610 from phq1910/patch-2 ... Update pins.h	2013-09-26 11:47:47 -07:00
Erik van der Zalm	314fd13c39	Fix for Viki display	2013-09-26 20:32:19 +02:00
phq1910	4f7c6dfe35	Update pins.h ... Include Pins cpu Sethi 3D	2013-09-26 11:40:54 -03:00
phq1910	57173739a1	Update Configuration.h ... Include CPU Sethi 3D	2013-09-26 11:29:44 -03:00
Erik van der Zalm	0dca49a7c0	Added Azteeg X3 board.	2013-09-24 17:31:16 +02:00
Erik van der Zalm	d8c2c810b4	Added info to the delta configuration files in the configuration.h file	2013-09-23 23:29:46 +02:00
Erik van der Zalm	9bc88f8bab	Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file	2013-09-23 23:25:11 +02:00
Erik van der Zalm	3ca1ca6869	Fixed missing ENCODER_PULSES_PER_STEP	2013-09-23 23:18:35 +02:00
Tim Koster	97b0da0c2e	Removed #ifndef BLINKM	2013-09-22 10:43:27 +03:00
Tim Koster	61db046b32	Added #ifdef BLINKM around new code. Also refined BlinkM.h.	2013-09-20 10:57:42 +03:00
Richard Miles	77df2ab0e7	Make Y_DUAL_STEPPER_DRIVERS disabled by default	2013-09-17 21:49:44 +01:00
Richard Miles	ed1ab42186	Added Y_DUAL_STEPPER_DRIVERS ... Enables two stepper drivers to be used for the Y axis (useful for Shapeoko style machines) Each Y driver can be stepped in either the same way or in opposite directions, accounting for different hardware setups (leadscrew vs. belt driven)	2013-09-17 19:19:20 +01:00
Richard Miles	f4a59e4ce5	Revert "Added Y_DUAL_STEPPER_DRIVERS" ... This reverts commit 7ee275b620.	2013-09-17 19:05:49 +01:00
Richard Miles	7ee275b620	Added Y_DUAL_STEPPER_DRIVERS ... Enables two stepper drivers to be used for the Y axis (useful for Shapeoko style machines) Each Y driver can be stepped either the same way or in opposite directions, accounting for different hardware setups (leadscrew vs. belt driven)	2013-09-17 19:02:00 +01:00
ErikZalm	6a1e980c6d	Merge pull request #600 from xoan/Encoder_Pulses_Per_Step ... add ENCODER_PULSES_PER_STEP	2013-09-14 04:56:45 -07:00
ErikZalm	20076a8bd3	Merge pull request #598 from GDV0/Marlin_v1 ... FIx compilation error when enabling SERVO_ENDSTOPS (#591)	2013-09-14 04:54:19 -07:00
Erik van der Zalm	3626b5ad8b	Removed Delta from the default config file. ... Changed EEPROM CHITCHAT behavior. M503 is always enabled.	2013-09-14 13:50:09 +02:00
Xoan Sampaiño	bf7007d02f	add ENCODER_PULSES_PER_STEP	2013-09-13 04:12:51 +02:00
GDV0	f17506c504	FIx compilation error when enabling SERVO_ENDSTOPS (#591)	2013-09-11 23:09:37 +02:00
Martin Lukasik	acd8619809	Fan fix for Panelolu2+Sanguinololu.	2013-09-10 22:10:58 +01:00
George Roberts	595580556c	Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert. ... Bug introduced in version 6beb42cdf6. Robert did a good job of simplifying but messed up this chunk of code. Looking at working version: 839bef6d5d it seems there is no case where encrot3 should be defined as 2 because if ULTICONTROLLER is defined then NEWPANEL is also defined.	2013-09-10 09:56:19 -04:00
Tim Koster	88dfeefca3	Define BlinkM default disabled	2013-09-10 12:32:21 +03:00
Tim Koster	5350faf2a2	Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1	2013-09-10 12:27:26 +03:00
Tim Koster	7016cc9511	Added BlinkM support over i2c	2013-09-10 12:18:29 +03:00
Tim Koster	3b315b3da0	Added BlinkM support over i2c	2013-09-06 22:25:39 +03:00
Jim Morris	f26f26b7bd	Fix the example delta configuration as someone forgot to do it.	2013-09-05 16:36:55 -07:00
Peter Hercek	9aa2229077	add command M666 for adjusting delta printer endstop position	2013-08-28 01:15:20 +02:00
Robert F-C	9547fb9dfb	Add duplication and auto-park mode for dual x-carriage support.	2013-08-08 00:10:26 +10:00
Steve Kelly	53614e5144	add pins for rambo lcd	2013-08-03 11:45:53 -05:00
Steve Kelly	b42d24e31e	add additional pins to avr2560 for rambo lcd	2013-08-03 11:37:12 -05:00
Nicolas Rossi	b0c8120fcc	Added feedrate setting in exemple config for manual moves from panel	2013-08-03 13:09:53 +02:00
Nicolas Rossi	a54fe2d73c	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 ... Conflicts: Marlin/Marlin_main.cpp	2013-08-03 13:05:56 +02:00
ErikZalm	7ea63d08df	Merge pull request #565 from iXce/avrdudeconfpath ... Detect OS in Makefile to use the correct avrdude.conf path	2013-08-02 13:16:07 -07:00
ErikZalm	4187b637a5	Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops ... separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)	2013-08-02 13:15:30 -07:00
ErikZalm	07e7de3600	Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions ... convert PROTOCOL macros from statements to (multiple, comma separated) expressions	2013-08-02 13:13:29 -07:00
Guillaume Seguin	c0c4c97db6	Detect OS in Makefile to use the correct avrdude.conf path	2013-08-01 19:20:27 +02:00
hg42@gmx.net	2ca983568d	separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)	2013-08-01 15:06:39 +02:00
hg42@gmx.net	3700f688f5	convert PROTOCOL macros from statements to (multiple, comma separated) expressions	2013-08-01 14:56:39 +02:00
daid	a504c88346	Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.	2013-08-01 14:12:30 +02:00
Nicolas Rossi	394ed08f88	Added feedrate setting for manual moves from panel	2013-07-30 14:33:30 +02:00
Nicolas Rossi	9bf1cf1b22	Pre-calculate diagonal rod length squared	2013-07-30 14:09:21 +02:00
Nicolas Rossi	4623e78ce0	Added Honeywell thermistor 135-104LAF-J01	2013-07-30 14:02:18 +02:00
Brendan-csel	d7f384f680	Skip SD menu refresh if nothing has changed	2013-07-30 14:02:15 +02:00
Brendan-csel	abc8320a68	Save LCD_CLICKED before it is cleared ... The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.	2013-07-30 14:02:13 +02:00
Guillaume Seguin	f4c3135c6d	Add Panelolu2 pins for RAMPS1.3	2013-07-30 14:02:11 +02:00
Guillaume Seguin	aae42c68f9	Update French translation in language.h	2013-07-30 14:02:08 +02:00
Guillaume Seguin	4d435c38a6	Add support of LiquidTWI2-based panels to Makefile ... Use LIQUID_TWI2=1 as make argument to enable this support	2013-07-30 14:02:06 +02:00
Guillaume Seguin	6c42a3a339	Woops, fix logic	2013-07-30 14:02:04 +02:00
Guillaume Seguin	376d8af2c8	Report temperatures for all extruders	2013-07-30 14:02:01 +02:00
ErikZalm	434b6a05c1	Merge pull request #552 from iXce/Marlin_v1 ... Report temperatures for all extruders in reply to M105	2013-07-29 10:39:21 -07:00
ErikZalm	bdc2621119	Merge pull request #561 from Brendan-csel/Marlin_v1 ... Fix for Viki LCD issues printing from SD card	2013-07-29 10:38:17 -07:00
ErikZalm	6965bd4e15	Merge pull request #560 from njprossi/Marlin_v1 ... Fixed move from panel for delta bot #557	2013-07-29 10:37:40 -07:00
ErikZalm	a55b33e613	Merge pull request #559 from iXce/panelolupinsramps13 ... Add Panelolu2 pins for RAMPS1.3	2013-07-29 10:37:03 -07:00
ErikZalm	8b34351537	Merge pull request #558 from iXce/frenchupdate ... Update French translation in language.h	2013-07-29 10:36:43 -07:00
ErikZalm	735e556724	Merge pull request #555 from iXce/liquidtwi2_makefile ... Add support of LiquidTWI2-based panels to Makefile	2013-07-29 10:33:54 -07:00
Brendan-csel	d80aecda0a	Skip SD menu refresh if nothing has changed	2013-07-29 21:00:29 +12:00
Brendan-csel	be2dea1dc6	Save LCD_CLICKED before it is cleared ... The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.	2013-07-29 20:58:09 +12:00
Nicolas Rossi	55c287a69e	Fixed move from panel for delta bot #557	2013-07-28 22:54:37 +02:00
Guillaume Seguin	1902d339b0	Add Panelolu2 pins for RAMPS1.3	2013-07-28 19:19:57 +02:00
Guillaume Seguin	eb23a68e92	Update French translation in language.h	2013-07-28 18:50:47 +02:00
ErikZalm	1561c6df51	Merge pull request #547 from wolfmanjm/delta-configuration ... Setup Default configuration for Deltas if DELTA is defined	2013-07-24 03:11:36 -07:00
Guillaume Seguin	374bc99fa3	Add support of LiquidTWI2-based panels to Makefile ... Use LIQUID_TWI2=1 as make argument to enable this support	2013-07-24 12:09:53 +02:00
Jim Morris	ab624eac2a	revert COnfiguratiuon to the same as head	2013-07-24 02:57:46 -07:00
Jim Morris	52f79ffeca	add an example default configuration for delta style bots	2013-07-24 02:55:52 -07:00
Jim Morris	b9d7ccf1cd	Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration ... Conflicts: Marlin/Marlin_main.cpp	2013-07-24 02:49:25 -07:00
Guillaume Seguin	d4d1540727	Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit	2013-07-24 11:19:38 +02:00
Guillaume Seguin	01ed99143c	Woops, fix logic	2013-07-23 23:34:42 +02:00
Guillaume Seguin	76841450c8	Only display poweron/poweroff if PS_ON_PIN > -1	2013-07-23 22:28:30 +02:00
Guillaume Seguin	44f327d738	Uniformly reindent language.h	2013-07-23 22:13:40 +02:00
Guillaume Seguin	326d2db025	Update language.h so that all languages compile ... Some strings still need translation, but at least everything compiles.	2013-07-23 22:11:54 +02:00
Guillaume Seguin	2cb716f513	Run Marlin/language.h through dos2unix	2013-07-23 21:49:37 +02:00
Guillaume Seguin	34da3a0a3f	Merge github.com:ErikZalm/Marlin into Marlin_v1 ... Conflicts: Marlin/language.h	2013-07-23 21:46:41 +02:00
Guillaume Seguin	18199ff960	Merge github.com:ErikZalm/Marlin into Marlin_v1	2013-07-23 21:33:52 +02:00
Robert F-C	fb5334f428	Fixed compile error when QUICK_HOME is defined. ... As well a couple of minor changes to handling of extruder offset for dual x-carriage mode.	2013-07-22 22:46:14 +10:00
Robert F-C	c3568398b5	Disable DUAL_X_CARRIAGE by default	2013-07-20 23:50:30 +10:00
Robert F-C	39cd3dbdbe	Remove dual x-carriage functionality that could/should be implemented in slicer ... Also added a couple of missed merge lines in homeaxis() from previous commit.	2013-07-20 13:07:50 +10:00
Jim Morris	fb20ceabce	enable soft endstops for delta ... disable delta by default	2013-07-17 16:21:51 -07:00
Jim Morris	d01ee7e7b5	fix zjerk being the same for delta as xy jerk ... add more delta defaults on delta make second home even slower	2013-07-17 16:14:07 -07:00
Robert F-C	d7390e13d9	Support dual x-carriage printers ... Dual x-carriage designs offer some substantial improvements for dual extruder printing.	2013-07-17 22:44:45 +10:00
Jim Morris	f3aa2a48e7	update max pos	2013-07-17 01:29:51 -07:00
Jim Morris	460751503e	Added default configurations for deltas when DELTA is defined	2013-07-17 01:17:27 -07:00
Maik Stohn	9da94c247a	fixed bad lcd commit from makr3d ... #elsif does not exist #elif is correct	2013-07-15 17:34:21 +02:00
Erik van der Zalm	59004023fd	Fixed typo	2013-07-15 17:22:56 +02:00
Erik van der Zalm	461dad6e05	Added : M32 - Select file and start SD print (Can be used when printing from SD card) ... Untested	2013-07-14 22:39:59 +02:00
Erik van der Zalm	c4a2077951	M109 and M190 now wait when cooling down if R is used instead of S. ... M109 S180 waits only when heating. M109 R180 also waits when cooling.	2013-07-14 21:10:24 +02:00
ErikZalm	8a2a3ef91d	Merge pull request #531 from iXce/Marlin_v1_lcd ... Only clamp panel movements if software endstops are enabled	2013-07-14 06:50:23 -07:00
Erik van der Zalm	6397b3339c	restored configuration.h defaults	2013-07-14 15:49:03 +02:00
Erik van der Zalm	cdaaad3df1	Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1	2013-07-14 15:45:49 +02:00
Erik van der Zalm	e3bdefd873	fixed missing #endif	2013-07-14 15:42:53 +02:00
Erik van der Zalm	a5be0c52c6	no message	2013-07-14 15:35:54 +02:00
Michael Mayer	e509cdbeb0	added contrast control function for gLCDs	2013-07-14 15:28:26 +07:00
Michael Mayer	99b7e926e7	added MaKr3d Melzi board	2013-07-14 15:17:55 +07:00
Gabino Lopez	68be33b1fc	Update language.h ... I update the spanish Messages, now this compile for spanish language.	2013-07-04 10:23:00 +02:00
daid	acb3271c9a	Merge pull request #534 from xifle/Marlin_v1 ... Fixes compiler warning for feedrate deadzone	2013-07-01 23:41:51 -07:00
xifle	61fe430d4f	Should fix compiler warning for feedrate deadzone	2013-07-01 11:10:02 +02:00
Gord Christmas	fde17d5720	Fix for ugly code compilation errors in SERVO_ENDSTOP checks	2013-06-28 08:02:04 -07:00
Guillaume Seguin	aa65c20d1f	Only clamp panel movements if software endstops are enabled	2013-06-28 14:18:00 +02:00
Erik van der Zalm	ecf3ab5de4	Added thermistor 60 to configuration.h	2013-06-27 23:25:51 +02:00
Nicolas Rossi	2daa85918e	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp Marlin/language.h Marlin/pins.h Marlin/ultralcd.cpp	2013-06-20 23:59:56 +02:00
Erik van der Zalm	2015989f84	Added DISABLE_MIN_ENDSTOPS	2013-06-18 19:20:26 +02:00
Christian Inci	648d45cfb2	Fix Pin Description Typo ... Reverse 'Bed' and 'Fan' at the RAMPS 33 Description. Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>	2013-06-16 23:35:33 +02:00
ErikZalm	171719f18c	Merge pull request #525 from lajos/ultralcd_pid ... ultralcd.cpp compile errors when !defined(PIDTEMP)	2013-06-16 00:02:54 -07:00
lajos	b519af4f05	fixed another !defined(PIDTEMP) compile in ultralcd.cpp	2013-06-15 20:49:18 -04:00
lajos	7d03c52511	fixed compile error in ultralcd.cpp when PIDTEMP undefined	2013-06-15 18:09:52 -04:00
lajos	02dee80fa5	added Azteeg X1 motherboard	2013-06-15 16:58:17 -04:00
Henrik Brix Andersen	47dc70e3ec	Fix location of avrdude.conf	2013-06-15 09:50:25 +02:00
Henrik Brix Andersen	1d258903bb	Allow command line compilation when using BEEPER.	2013-06-15 09:36:55 +02:00
Erik van der Zalm	e34c9981ab	Delta disabled by default	2013-06-11 22:33:58 +02:00
Erik van der Zalm	26a441fc7d	More 3Drag controller patches.	2013-06-10 18:26:15 +02:00
Erik van der Zalm	ac975ed8c2	Merge branch 'deltabot' into Marlin_v1	2013-06-10 18:20:29 +02:00
Jim Morris	caa848f943	fix homing for deltas	2013-06-09 21:10:00 -07:00
Erik van der Zalm	7ad12be763	Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1 ... Conflicts: Marlin/Configuration.h README.md	2013-06-09 23:10:41 +02:00
Erik van der Zalm	408169aef4	Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1 ... Conflicts: Marlin/Configuration.h Marlin/language.h Marlin/pins.h	2013-06-09 22:57:40 +02:00
Erik van der Zalm	bd96d22bfb	Merge branch 'Marlin_v1' into thinkyhead ... Conflicts: Marlin/Configuration.h Marlin/Configuration_adv.h Marlin/Marlin.h Marlin/Marlin_main.cpp Marlin/Servo.cpp Marlin/language.h Marlin/pins.h Marlin/planner.cpp Marlin/ultralcd_implementation_hitachi_HD44780.h README.md	2013-06-09 22:26:47 +02:00
Erik van der Zalm	73f21cd5d6	Spanish updated so far.	2013-06-09 21:40:35 +02:00
Erik van der Zalm	6f4a6e531c	Merge branch 'deltabot' into Marlin_v1	2013-06-09 13:55:18 +02:00
Erik van der Zalm	01edf22a10	Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.	2013-06-09 13:54:19 +02:00
Erik van der Zalm	ff6fa09ecf	Moved corexy implementation from stepper to planner ... (Thanks iquizzle)	2013-06-09 13:10:06 +02:00
Erik van der Zalm	c8dcc7c208	Allow increasing the software PWM frequency.	2013-06-09 12:52:49 +02:00
Erik van der Zalm	8b0d82e9db	Removed "awaiting translation" for french	2013-06-09 12:24:06 +02:00
Erik van der Zalm	1e05d192ab	Make the beep tone less offensive	2013-06-09 12:21:16 +02:00
Erik van der Zalm	373f3ecab3	Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp Marlin/pins.h	2013-06-09 00:51:58 +02:00
kiyoshigawa	f295712008	Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h	2013-06-08 09:27:56 -06:00
kiyoshigawa	69b02031ca	Fixed small error in lcd define statements.	2013-06-08 09:09:11 -06:00
kiyoshigawa	6a81291c57	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 ... This should fix issues with pull request 467, I hope. Conflicts: Marlin/Configuration.h Marlin/Marlin.pde Marlin/ultralcd_implementation_hitachi_HD44780.h	2013-06-08 08:48:18 -06:00
BorisLandoni	c1cb5977ee	Update Configuration.h	2013-06-08 14:37:39 +02:00
BorisLandoni	8a5bd8a808	Update Configuration.h	2013-06-08 14:37:17 +02:00