2672 Commits

Author	SHA1	Message	Date
Scott Lahteine	713953d8c1	Upstream commits, allow no extruder in M105	2015-04-03 19:16:38 -07:00
Scott Lahteine	8f893eb8df	Merge pull request #1798 from thinkyhead/fixup_probing ... Fix probe height at G28 start	2015-04-03 19:03:00 -07:00
Scott Lahteine	dde7e11f8e	Merge branch 'Development' into fixup_tr ... Latest upstream commits	2015-04-03 18:56:52 -07:00
Scott Lahteine	abd7fc36b6	Fix probe height at G28 start	2015-04-03 18:54:55 -07:00
Scott Lahteine	610c8c5471	Merge pull request #1795 from thinkyhead/fixup_probing ... Finish pin tests	2015-04-03 18:44:44 -07:00
Scott Lahteine	e4934164e4	Merge pull request #1790 from Wurstnase/fix_home_z ... fix feedrate for homing z	2015-04-03 18:35:09 -07:00
Scott Lahteine	a469d796e1	Add cleanups needed for #1772	2015-04-03 18:14:57 -07:00
Scott Lahteine	c0ca26cd50	Merge branch 'Development' into fixup_probing ... Latest upstream commits	2015-04-03 18:05:17 -07:00
Scott Lahteine	5c1f08a35f	Merge pull request #1772 from croadfeldt/Merge_cleanup ... Z_PROBE_ENDSTOP	2015-04-03 18:04:31 -07:00
Scott Lahteine	db7b0ea0cf	Merge pull request #1569 from Wackerbarth/Development ... Incorporating Build Numbers	2015-04-03 16:56:31 -07:00
Scott Lahteine	92119d0f7d	Static delta[] for SCARA	2015-04-03 16:46:56 -07:00
Scott Lahteine	007a4bd421	Adjust spacing in view function	2015-04-03 16:41:58 -07:00
Scott Lahteine	424d5495e4	Add PIDTEMPBED to EEPROM	2015-04-03 16:38:05 -07:00
Scott Lahteine	6b919e14c1	Group all universal variables	2015-04-03 15:45:41 -07:00
Scott Lahteine	21cd2e4fae	Merge branch 'Development' into fixup_probing ... Latest upstream commits	2015-04-03 15:32:15 -07:00
Scott Lahteine	0e8182bbf2	Additional pin tests, cleanup	2015-04-03 15:31:35 -07:00
Wurstnase	45565b680d	second wrong feedrate	2015-04-03 18:01:28 +02:00
Wurstnase	581b2aae04	fix feedrate for homing z ... max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.	2015-04-03 16:11:32 +02:00
Edward Patel	48b1c3822f	Merge branch 'Development-Marlin' into Development	2015-04-03 00:46:30 +02:00
Richard Wackerbarth	ccdaea51ba	Add KosselPro	2015-04-02 09:20:24 -05:00
Richard Wackerbarth	f4599143eb	Allow M115 to better reflect the build	2015-04-02 09:20:24 -05:00
Richard Wackerbarth	34c7d45879	Hook for Auto-generated Build Version ... The automatic versioning system extracts a build version number from the SCM system That versioning information is written to the file _Version.h, a file that is NOT preserved in the SCM. If such a file will be present, we include it here to utilize the parameters that are defined therein.	2015-04-02 09:20:24 -05:00
Scott Lahteine	c756b4cf07	Comment tweak	2015-04-02 06:11:03 -07:00
AnHardt	23cd54755f	Fix typo in Marlin_main.cpp ... related to current_position[Z_AXIS] and retract_zlift. '+ =' -> '+=' Fix for #1786	2015-04-02 14:50:31 +02:00
Scott Lahteine	e96df67630	Clarify thermal_runaway_protection ... - Add comments documenting `thermal_runaway_protection` - Add an enum for the thermal runaway states - Add macros for temperature helper functions - Fix a glitch with the z probe sled in homeaxis	2015-04-02 05:10:14 -07:00
Chris Roadfeldt	0afe6696f0	Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup	2015-04-01 19:31:20 -05:00
Chris Roadfeldt	59994bd519	Not doing network admin work, pin not ping... :)	2015-04-01 19:24:42 -05:00
Chris Roadfeldt	916f59e35f	Spaces not tabs in language.h. ... Catch unlikely but possible error and head crash when using Z_PROBE_REPEATABILITY_TEST	2015-04-01 19:22:05 -05:00
Scott Lahteine	66b3b53e76	Merge pull request #1762 from AnHardt/MiMa ... Fix MIN&MAX temperatures again	2015-04-01 16:52:07 -07:00
Edward Patel	6b91b7b411	Mesh bed leveling: Added G29 S3 + finer steps in manual probing. ... * Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually * Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h	2015-04-01 21:18:51 +02:00
Chris Roadfeldt	26dc80bf2d	Typo fixed...	2015-04-01 13:47:17 -05:00
Chris Roadfeldt	2966ae2022	Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP ... is not used.	2015-04-01 13:32:25 -05:00
Wurstnase	67d5e7973e	old bump_divisor for cartesian/corexy-printer ... some people are starting to ask why homing is so slow. this is the old standard hard-coded value.	2015-04-01 20:17:49 +02:00
Chris Roadfeldt	bb41edc2ef	Fixed extra #endif	2015-04-01 12:13:25 -05:00
Chris Roadfeldt	a57862e29f	Cleaning up code in prep for merge with upstream.	2015-04-01 11:40:24 -05:00
Chris Roadfeldt	745d9fe1a4	Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup ... Conflicts: Marlin/Marlin_main.cpp	2015-04-01 10:31:02 -05:00
AnHardt	488666832b	Remove the previously introduced ()	2015-04-01 13:40:05 +02:00
Scott Lahteine	443468df8d	Merge pull request #1771 from AnHardt/iss1770 ... Added new - changed entries from Fix up LCD_PROGRESS_BAR	2015-04-01 02:13:30 -07:00
Scott Lahteine	9593f09b99	Merge pull request #1764 from thinkyhead/probe_leveling ... Fix homing and leveling	2015-04-01 02:00:39 -07:00
Scott Lahteine	72c7de3570	Cleanup M48	2015-04-01 01:48:45 -07:00
Scott Lahteine	97a258b0b0	Clean up, document home_axis	2015-04-01 01:44:13 -07:00
AnHardt	831016b09f	Added new - changed entries from Fix up LCD_PROGRESS_BAR ... for when no LCD is defined. Fix for #1770.	2015-04-01 10:17:17 +02:00
Chris Roadfeldt	a508d835db	Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP. ... Updated documentation in Configuration.h. Cleaned up and commented some code relating to Z_PROBE_ENDSTOP. Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.	2015-04-01 02:14:55 -05:00
Chris Roadfeldt	fdb4ddbdea	Merge remote-tracking branch 'MarlinFirmware/Development' into Development	2015-04-01 00:52:08 -05:00
atfield90	d273c90d53	Added support for Atmega 1281 chip	2015-04-01 05:15:27 +02:00
Scott Lahteine	1c7391717e	Include sync_plan_position_delta for SCARA also	2015-03-31 19:58:03 -07:00
Scott Lahteine	8231fb166d	Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM ... Fix: Audio feedback for MENU_MILTIPLIER_ITEM click	2015-03-31 19:29:48 -07:00
Scott Lahteine	0b57a2ab8b	Merge pull request #1757 from bq/Translation-strings ... Added new trasnslatable labels.	2015-03-31 18:56:25 -07:00
Scott Lahteine	18bb6be80e	Fix homing and leveling ... - Include the current Z when raising the axis after and between probing - Add `sync_plan_position_delta` for parity with `sync_plan_position` - Clean up and clarify `M48`, `dock_sled`, and others	2015-03-31 18:52:19 -07:00
AnHardt	3f2e863206	Improve conditions for HAS_TEMP ... and use them in temperuture.h Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.	2015-04-01 02:56:14 +02:00
AnHardt	85f8a26ba4	Fix MIN&MAX temperatures again ... replaced GE0 with th matching GEX in the second row. added some ()	2015-04-01 00:48:04 +02:00
AnHardt	19b11dfdd7	Fix can't enter MENU_MULTIPLIER_ITEM	2015-03-31 18:29:16 +02:00
Chris Roadfeldt	c89b8368ee	Merge remote-tracking branch 'MarlinFirmware/Development' into Development ... Conflicts: Marlin/Marlin_main.cpp	2015-03-31 11:08:36 -05:00
Ivan Galvez Junquera	d08782386b	Added new trasnslatable labels. ... * Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files. * Available translations: EN, FR, DE, ES, IT, PT, PT-BR.	2015-03-31 16:59:43 +02:00
Scott Lahteine	97a69d9b1c	Correct XYZ after obtaining plan_bed_level_matrix ... The current position needs to be updated by using the inverse `plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are transformed by the `plan_bed_level_matrix` from this point forward.	2015-03-31 04:24:13 -07:00
Scott Lahteine	5f6962dd90	Merge pull request #1755 from thinkyhead/fixup_config ... Raise when not retracting	2015-03-31 03:47:01 -07:00
Scott Lahteine	ae89ccd2c7	Use Z_RAISE_BETWEEN_PROBINGS	2015-03-31 03:45:21 -07:00
Scott Lahteine	9a5a7a3f68	Raise when not retracting ... Code to raise the probe before retraction is good, but the code should always raise the probe, not just when retracting	2015-03-31 03:38:03 -07:00
Scott Lahteine	6ff1620fcb	Merge pull request #1753 from thinkyhead/fix_extruder_offset ... Fix EXTRUDER_OFFSET compiler error	2015-03-31 03:21:45 -07:00
Scott Lahteine	cda4bd4ad9	Correct the comment about M206	2015-03-31 03:20:15 -07:00
Scott Lahteine	935592cf6a	offsets off by default	2015-03-31 02:50:52 -07:00
Scott Lahteine	2a45922afe	Restore extruder_offset, init more simply	2015-03-31 02:49:47 -07:00
Scott Lahteine	28792e5731	Fix typo in assignment	2015-03-31 02:10:49 -07:00
Scott Lahteine	bb6174524f	Fix EXTRUDER_OFFSET compiler error ... - Addressing issue #1741	2015-03-31 02:08:57 -07:00
Scott Lahteine	571652c49b	Fix LCD click ... - Make the default LCD click sound more pleasant - Fix warnings about bed temperature runaway	2015-03-31 01:41:24 -07:00
Chris Roadfeldt	45ece5afb1	Merge remote-tracking branch 'MarlinFirmware/Development' into Development	2015-03-31 03:07:57 -05:00
Chris Roadfeldt	17707e7479	Fixed Z_PROBE_PIN pullup bug. ... Documented some additional areas that should be addressed if Z_PROBE is fully separated from Z_MIN or Z_MAX. Fixed a documentation error in sanity checks. Servos start at 0 not 1.	2015-03-31 02:56:41 -05:00
Scott Lahteine	21ab44cfa7	Merge pull request #1750 from thinkyhead/fixup_config ... Bring all configs up to date	2015-03-30 23:49:04 -07:00
Scott Lahteine	50145266cd	Merge pull request #1748 from thinkyhead/raise_before_homing ... Apply Z_RAISE_BEFORE_HOMING before homing XY	2015-03-30 23:37:41 -07:00
Scott Lahteine	a117b6bff6	Merge pull request #1747 from thinkyhead/progress_bar_tweak ... Fix up LCD_PROGRESS_BAR	2015-03-30 23:37:28 -07:00
Scott Lahteine	3348b3bf0c	Allow SD_FINISHED_RELEASECOMMAND to be undefined	2015-03-30 23:31:48 -07:00
Scott Lahteine	82794fa5f7	Add delta generic not renaming	2015-03-30 23:25:04 -07:00
Scott Lahteine	ba2c7cb467	Update configs with all the latest	2015-03-30 23:24:33 -07:00
Chris Roadfeldt	ec1d9c0b8f	Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.	2015-03-31 01:06:01 -05:00
Chris Roadfeldt	3175c70c79	Manually synching back up with MarlinFirmware/Development.	2015-03-31 00:11:11 -05:00
Chris Roadfeldt	faac2af4af	Merge remote-tracking branch 'origin/Development' into Development	2015-03-31 00:03:07 -05:00
Chris Roadfeldt	3be00cce6f	Merge remote-tracking branch 'MarlinFirmware/Development' into Development ... Conflicts: Marlin/Configuration.h	2015-03-30 23:59:01 -05:00
Chris Roadfeldt	e08f8eed05	Revert 06f767d..cba5692 ... This rolls back to commit 06f767d608.	2015-03-30 23:51:36 -05:00
Scott Lahteine	5e82ed4f30	Restore ENDSTOPPULLUPS in Configuration.h	2015-03-30 21:15:16 -07:00
Chris Roadfeldt	992b07ca57	Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.	2015-03-30 22:58:10 -05:00
Chris Roadfeldt	cba5692673	Merge remote-tracking branch 'MarlinFirmware/Development' into Development ... Conflicts: Marlin/Marlin_main.cpp Marlin/stepper.cpp	2015-03-30 22:33:05 -05:00
Scott Lahteine	8500c80b33	Apply Z_RAISE_BEFORE_HOMING before homing XY	2015-03-30 20:22:21 -07:00
Scott Lahteine	92b54aa27e	#define HAS_POWER_SWITCH	2015-03-30 19:44:53 -07:00
Scott Lahteine	5519882eea	Fix up LCD_PROGRESS_BAR ... - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.	2015-03-30 18:00:54 -07:00
Scott Lahteine	6864280803	Use elif and parentheses in conditionals	2015-03-30 16:52:27 -07:00
Scott Lahteine	8c136a5ab5	Conditionals and comments for PS = 0	2015-03-30 16:50:05 -07:00
Scott Lahteine	2faed961ce	Allow POWER_SUPPLY 0 for no power switch	2015-03-30 16:39:47 -07:00
Scott Lahteine	baa6787393	Merge pull request #1740 from thinkyhead/fixup_homing ... Apply leveling for DELTA	2015-03-30 15:45:33 -07:00
AnHardt	9ac7dc675e	Make filament display on dogm_... same as hitachi... ... Thanks @MagoKimbra.	2015-03-30 16:56:21 +02:00
AnHardt	50a732360a	Replace extrudemultiply by extruder_multiply[active_extruder] ... Fix for #1460. Seems to work with only one extruder. Can't test this myself with more.	2015-03-30 13:35:03 +02:00
Scott Lahteine	e63076504d	Merge pull request #1733 from AnHardt/c20 ... Get back folder symbols on Hitachi displays	2015-03-30 01:57:00 -07:00
Scott Lahteine	41d258697a	Pass the z for after probing to retract_z_probe ... A `z_before` value is passed to probe_pt, but the `retract_z_probe` function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as other cases do. This may be superfluous, so this is a test, and will be reverted if it has no effect.	2015-03-30 00:45:02 -07:00
croadfeldt	06f767d608	Merge remote-tracking branch 'upstream/development' into development	2015-03-30 02:10:49 -05:00
Scott Lahteine	b47fa8c064	Merge pull request #1735 from AnHardt/compilerCandy ... Remove some further warnings	2015-03-29 23:55:19 -07:00
Scott Lahteine	e96db1cd6c	Make G29 shared function inline	2015-03-29 23:21:39 -07:00
Scott Lahteine	d73b169de3	Apply leveling for DELTA, ... - Fix `prepare_move` function not calling `adjust_delta` - Add more shorthand for plan_buffer_line. - Fix wrong `federate` usage, assuming they are all mm/m - Minor `stepper.cpp` cleanup	2015-03-29 23:16:12 -07:00
Scott Lahteine	85b67e5223	Merge pull request #1738 from thinkyhead/fixup_homing ... Fix G29 E and M48 n	2015-03-29 20:08:19 -07:00
Scott Lahteine	ce44bee28b	Small code reduction	2015-03-29 19:45:14 -07:00
Scott Lahteine	0213f7f016	Cleanup case for M666	2015-03-29 19:39:43 -07:00
Scott Lahteine	803425e12c	Fix G29 E and M48 n ... - Users prefer `G29 E` to work like `M48 E` so fixed that - `M48 n` replaced with `M48 P` (or `p`). `n` legacy support - Shorten some strings to save precious bytes - Smaller code for 3-point probing	2015-03-29 18:56:09 -07:00
Scott Lahteine	1e9999711c	Merge pull request #1736 from thinkyhead/fixup_homing ... Fix G28 homing Y with X	2015-03-29 18:27:17 -07:00
Scott Lahteine	d738b7acdd	Merge pull request #1724 from Natealus/Development ... Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap	2015-03-29 18:26:32 -07:00
Scott Lahteine	e8ae51bfe3	Fix G28 homing Y with X ... - Fixed a typo causing G28 to home incorrectly - Added documentation to G28 - Added homeXYZ bools to neaten the code - Added a note about home_offsets being questionable	2015-03-29 18:06:59 -07:00
AnHardt	7b2550a604	Times can't be negative. ... cardreader.cpp needs temperature.h for autotempShutdown() when AUTOTEMP is defined but warns about unused variables. Unpublished variables by putting them in to temperature.cpp.	2015-03-30 01:58:46 +02:00
AnHardt	507efa771b	Remove unused variable fan_rot ... and satisfy the compiler about the implicit compare.	2015-03-30 01:46:38 +02:00
AnHardt	2b959a7752	Some additional {} to make the compiler happy.	2015-03-30 01:42:35 +02:00
AnHardt	0f1bd6e4a7	In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned ... therefor in macro ST7920_WRITE_BYTE(a) cast a to uint8_t to make the compiler happy.	2015-03-30 01:40:58 +02:00
AnHardt	81bab8739d	Get back folder symbols on Hitachi displays ... and make use of column 20.	2015-03-29 17:29:48 +02:00
Chris Roadfeldt	a9802c95b3	Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is.	2015-03-29 04:18:37 -05:00
Chris Roadfeldt	62834a1c43	Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled, ... unless Z_SAFE_HOMING is.	2015-03-29 03:55:41 -05:00
Chris Roadfeldt	666fad3494	Typo fixed in sanity check.	2015-03-29 03:25:03 -05:00
Chris Roadfeldt	08a7aa16c5	Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined.	2015-03-29 03:21:48 -05:00
Chris Roadfeldt	80285251cc	More config cleanup work for Z_PROBE_AND_ENDSTOP.	2015-03-29 03:06:20 -05:00
Chris Roadfeldt	fe4549cd83	Config file Z_PROBE_AND_ENDSTOP description clean up.	2015-03-29 03:04:59 -05:00
Chris Roadfeldt	82d2f11129	More additional sanity checks for Z_PROBE_AND_ENDSTOP	2015-03-29 02:53:55 -05:00
Chris Roadfeldt	05134f0807	Additional Sanity Checks for Z_PROBE_AND_ENDSTOP	2015-03-29 02:51:51 -05:00
Chris Roadfeldt	c75a5e8c55	Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h. ... Confirmed Sanity checks are working.....	2015-03-29 02:38:08 -05:00
Chris Roadfeldt	a98ac4033b	Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support.	2015-03-29 02:36:26 -05:00
Chris Roadfeldt	6125124d6c	Config file cleanup for Z_PROBE_AND_ENDSTOP support.	2015-03-29 02:29:16 -05:00
Chris Roadfeldt	324c14943b	Bug fixes for Z_PROBE_AND_ENDSTOP. ... Code cleanup for Z_PROBE_AND_ENDSTOP. Added Z_PROBE_PIN to pins_RAMPS_13.h	2015-03-29 02:16:09 -05:00
Natealus	ca5821aa57	Made #ifdef DELTA branch instead ... Another fellow here gave me the idea to do it this way	2015-03-29 01:08:00 -06:00
Natealus	04fda6b3e9	Undesired behavior with endstops swapped ... Made my swap commented out so its the option not the default.	2015-03-29 00:55:47 -06:00
Natealus	ca1477d830	Revert "Undesired behavior with endstops swapped" ... This reverts commit 15028e9b08.	2015-03-29 00:52:53 -06:00
Natealus	15028e9b08	Undesired behavior with endstops swapped ... I made my changes to swap MIN and MAX endstops on the Azteeg X3 Pro the option rather than the default to fix unexpected reversal.	2015-03-29 00:42:40 -06:00
Nate Stokes	18245c6cd2	Update pins_RAMBO.h ... Updated for the changes that Thinkyhead made before I submitted mine.	2015-03-28 22:29:54 -06:00
Natealus	234a9d0b12	Viki 2 Pins from Manual ... I added in the pins into the new board files for the Azteeg X3, X3 Pro, Printrboard, and Rambo. I'm sure it can be added for others too but these are the manual specified pins. Just like many things here though, I can't test for the boards other than the Azteeg X3 Pro. Hopefully it works smoothly for everyone who happens on this nifty display. :)	2015-03-28 22:11:12 -06:00
Scott Lahteine	a22efc5f11	Merge pull request #1597 from Wurstnase/g29_auto_script ... G29 auto script	2015-03-28 20:54:17 -07:00
Scott Lahteine	62a3da9618	Merge pull request #1723 from thinkyhead/tweak_g92 ... Tweak G92	2015-03-28 20:53:37 -07:00
Scott Lahteine	afff968e88	ARRAY_BY_EXTRUDERS, shorthand to sync planner ... - Add some documentation to planner and stepper headers - Patch up RAMBO pins with undefs - Add `sync_plan_position` inline to set current XYZE - Swap indices in `extruder_offset` to fix initialization values	2015-03-28 20:33:21 -07:00
Scott Lahteine	2b0c25a091	Tweak G92 to call plan_set_position only once, yes?	2015-03-28 19:18:24 -07:00
Natealus	22bea37393	Azteeg X3 Pro Pin Revisions ... I added the fan pins in here and left them at -1 in configuration_adv.h and it works fine. Pinned for a 4 extruder from 1-4 and HE5 being the controller fan, HE6 being the Extruder Auto Fan/Water pump in the Kraken case, and HE7 being for part cooling fan. Added in descriptions for the MIN MAX pin swap and for servo motor additions.	2015-03-28 20:14:42 -06:00
Scott Lahteine	93dc0d0518	Merge pull request #1718 from AnHardt/blink ... Move variable blink from ultralcd.h to dogm_lcd_implementation.h	2015-03-28 16:20:33 -07:00
Scott Lahteine	edb67ea165	Patch generic delta config ... - Addressing issue mentioned at #1699	2015-03-28 14:13:25 -07:00
AnHardt	c481c3b180	Move variable blink from ultralcd.h to dogm_lcd_implementation.h ... to avoid warnings about unused blink. Concentrate definitions of variables in dogm_lcd_implementation.h to one place. Make only local used variable currentfont static.	2015-03-28 13:14:38 +01:00
Chris Roadfeldt	059052889f	Further Sanity Checks for Z_PROBE_AND_ENDSTOP.	2015-03-28 06:08:04 -05:00
Chris Roadfeldt	8b81f20c61	Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to ... be. Added Sanity Check for it. Added hook so it's enabled.	2015-03-28 05:55:42 -05:00
Chris Roadfeldt	fd823449ad	Added serial message for Z Probe trigger.	2015-03-28 05:42:38 -05:00
Chris Roadfeldt	92eb8109ab	Fix declaration of old_z_probe_endstop.	2015-03-28 05:09:48 -05:00
Chris Roadfeldt	44b88b41a2	Added credit for code.	2015-03-28 05:01:04 -05:00
Chris Roadfeldt	2979b40a7a	Fixed typo in Z Probe and Endstop section.	2015-03-28 04:41:03 -05:00
Chris Roadfeldt	9f3ff14008	Enabled separate Z Probe and Z Axis endstop use at same time. ... Typo fixes in comments in existing code.	2015-03-28 04:31:51 -05:00
Scott Lahteine	b14be7235e	Merge pull request #1585 from galexander1/strtod_e_fix ... Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)	2015-03-27 20:49:03 -07:00
Scott Lahteine	ba871e46bf	Fix compiler warnings ... - Patched up for most included configurations	2015-03-27 20:29:05 -07:00
Scott Lahteine	ffe0df4b36	Latest upstream commits	2015-03-27 18:30:56 -07:00
Scott Lahteine	bc2f249cc6	Merge pull request #1622 from AnHardt/tm-utf-minus-kanji ... The big Language Pack	2015-03-27 18:24:19 -07:00
Scott Lahteine	abfcbd793f	Merge pull request #1693 from chris-bo/rework_lcd_beeper ... use only one implementation for beeper feedback	2015-03-27 17:03:38 -07:00
Scott Lahteine	55739a4efe	Fix Z_APPLY_STEP	2015-03-27 17:02:11 -07:00
Scott Lahteine	df02b992b0	Fix redundant_temperatrure_raw setting	2015-03-27 16:37:22 -07:00
Scott Lahteine	fe29bdd72b	Also fix temperature externs	2015-03-27 16:26:07 -07:00
Scott Lahteine	578f93bc26	Fixup temp arrays and leveling equation, prepare for merge	2015-03-27 16:20:23 -07:00
Scott Lahteine	7d472367e2	Merge pull request #1713 from epatel/Development ... Parentheses need here otherwise sanitycheck.h does wrong thing on line 222	2015-03-27 16:14:55 -07:00
Scott Lahteine	ce485175eb	Give all temp arrays 4 indices	2015-03-27 16:11:28 -07:00
Edward Patel	782464ea4d	Parentheses need here otherwise sanitycheck.h does wrong thing on line 222	2015-03-27 20:22:59 +01:00
Scott Lahteine	460f73056b	Fix ECHOPAIR ambiguity ... - Also patch up some warnings	2015-03-27 00:46:39 -07:00
Scott Lahteine	19d418cd6a	Fix up the code to eliminate warnings	2015-03-27 00:32:58 -07:00
Scott Lahteine	b2496533c6	Put " M" into pmem	2015-03-26 20:30:14 -07:00
Scott Lahteine	267d6bef15	Eliminate most warnings ... - Fix a bug reading `code_value` for `M503 Sn` - Hide and remove unused variables	2015-03-26 20:07:17 -07:00
Scott Lahteine	3fd7790a15	Merge branch 'Development' into fixup_leveling ... Latest upstream commits	2015-03-26 19:56:58 -07:00
Scott Lahteine	b76a352d41	Fix the planeNormal calculation	2015-03-26 17:14:07 -07:00
Scott Lahteine	410f64782a	Always 4 temp sensors	2015-03-26 16:22:21 -07:00
Scott Lahteine	0b32431551	Remove abs() from planeNormal.z	2015-03-26 16:20:23 -07:00
Scott Lahteine	53169d96e8	Set temp_meas_ready in set_current_temp_raw	2015-03-26 16:02:15 -07:00
Scott Lahteine	06eb7f5b3c	Latest upstream commits	2015-03-26 15:30:51 -07:00
Scott Lahteine	04328d7537	Add zprobe_zoffset in set_bed_level_equation_* ... - Also a small tweak to SanityCheck.h	2015-03-26 15:29:16 -07:00
Scott Lahteine	d2e73545ba	Merge pull request #1705 from AnHardt/ddt ... Avoid warnings in SanitiCheck.h	2015-03-26 15:16:37 -07:00
Scott Lahteine	78090275a9	Fix probe range editing ... - Increase the probe offset range to -20…20 - Apply the range limits to the menu item	2015-03-26 13:52:48 -07:00
AnHardt	1ff6df8f9e	Avoid warnings in SanitiCheck.h ... /SanityCheck.h:107:53: warning: missing terminating ' character ...	2015-03-26 21:30:53 +01:00
AnHardt	ebe5b87c2c	< like in the oher compareble loops ... to avoid: Marlin_main.cpp:1790: warning: array subscript is above array bounds.	2015-03-26 21:18:19 +01:00
AnHardt	20f909567a	Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji ... Conflicts: README.md Solved	2015-03-26 10:05:00 +01:00
Christian Bohn	eab5fad539	code formatting	2015-03-26 09:00:34 +01:00
Scott Lahteine	abadeac08d	Group zprobe_zoffset with bed leveling	2015-03-25 23:06:33 -07:00
Scott Lahteine	9e8427f253	Merge pull request #1698 from zeuseye/Development ... Clean "fromsd" array if not SDSUPPORT	2015-03-25 22:21:57 -07:00
Scott Lahteine	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