SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5966 commits 1 branch 0 tags 118 MiB
Commit graph

344 commits

Author SHA1 Message Date
Petr Zahradnik 43ff0ce35f Rewritten FILAMENT_CHANGE_ENABLE feature 2016-07-02 15:34:33 -07:00
Anthony Birkett 7a377c1d75 Add "About Printer" information menu. 
Includes:
  *firmware version / branch / date.
  *extruder count
  *board information (name, serial details, power supply type)
  *thermistors (names, min/max temperatures)
  *printer statistics (PRINTCOUNTER details)

Thanks to @thinkyhead for contributions.
 2016-07-02 15:22:26 -07:00
Scott Lahteine f84d85f761 Cleanup extruder runout configs 2016-06-30 01:40:41 -07:00
Scott Lahteine 683975cf90 Fix spelling in a config comment 2016-06-28 16:49:13 -07:00
Scott Lahteine 10da7ac86c Combine Z raise before/after options 2016-06-26 13:56:30 -07:00
Scott Lahteine 03c70c1990 SERVO_DEACTIVATION_DELAY => SERVO_DELAY 2016-06-23 14:33:29 -07:00
Scott Lahteine bd01592816 Goodbye MECHANICAL_PROBE 2016-06-22 17:13:33 -07:00
Scott Lahteine b590a7dee0 Make Z_RAISE_BETWEEN_PROBINGS a more general option 2016-06-22 14:00:44 -07:00
Scott Lahteine d50539583a Make XY_PROBE_SPEED a general probe option 2016-06-22 03:04:47 -07:00
Scott Lahteine 2798499b71 XY_TRAVEL_SPEED => XY_PROBE_SPEED 2016-06-22 02:45:25 -07:00
Scott Lahteine b0e47608e6 Merge pull request #4108 from esenapaj/Fix-for-PR-#4093 
Fix for PR #4093 (Make Z Probe options independent of ABL), etc
 2016-06-21 18:12:08 -07:00
Scott Lahteine 40cd20a236 Fix comments on EXPERIMENTAL_I2CBUS 2016-06-21 17:58:44 -07:00
esenapaj d583ea852d Standardize format description of Panel 2016-06-21 20:51:27 +09:00
esenapaj aa6d35bd49 Move code block of probe to appropriate position 2016-06-21 20:36:46 +09:00
esenapaj 740fb2ce39 Adjust spacing 2016-06-21 19:37:45 +09:00
Scott Lahteine 3996242e9d Allow Z_MIN_PROBE_REPEATABILITY_TEST solo 2016-06-21 01:56:40 -07:00
Scott Lahteine 9beb3f2f5e Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup 
FIL_RUNOUT_INVERTING false by default
 2016-06-19 19:46:14 -07:00
Scott Lahteine f215b30932 Merge pull request #4093 from thinkyhead/rc_probe_without_abl 
Make Z Probe options independent of ABL
 2016-06-19 19:44:25 -07:00
Scott Lahteine dfbf8b3c2c FIL_RUNOUT_INVERTING false by default 2016-06-19 19:25:26 -07:00
Scott Lahteine de12228758 Make Z Probe options independent of ABL 2016-06-19 18:47:27 -07:00
Scott Lahteine f8c278ce4d Cartesio UI display option in all configs 2016-06-19 17:39:46 -07:00
Scott Lahteine bd4ec727e7 Merge pull request #4066 from thinkyhead/rc_M851_with_probe 
Make M851 standard with a bed probe
 2016-06-17 17:32:55 -07:00
Scott Lahteine eab44b30d4 Safety and serial sections 2016-06-17 15:19:43 -07:00
Scott Lahteine fc56a547d1 Rename movement section to motion 2016-06-17 15:19:43 -07:00
Scott Lahteine 1000563d80 Make M851 standard with a bed probe 2016-06-17 15:19:42 -07:00
Scott Lahteine 47ce810f52 Remove support for XY servo endstops 2016-06-17 14:19:17 -07:00
Scott Lahteine d991a4c24a Merge pull request #4063 from thinkyhead/rc_remove_swp_files 
Delete mysterious .swp files from #3609
 2016-06-16 17:22:48 -07:00
Scott Lahteine ebbed2975e Delete mysterious .swp files from #3609 2016-06-16 16:42:03 -07:00
Scott Lahteine 02e5dad29a Include Croatian in language listings 2016-06-16 16:18:26 -07:00
Scott Lahteine f639044c24 Merge pull request #3609 from jbrazio/feature/config-version 
Adds versioning for Configuration.h & Configuration_adv.h
 2016-06-15 22:09:47 -07:00
esenapaj 741cda0e47 Follow-up the PR #3676(Advance extrusion algorithm – LIN_ADVANCE) 
・Update forgotten example configurations
 2016-06-15 00:10:15 +09:00
João Brázio 8ccd97e7cc
Updated all example configuration files 2016-06-12 00:36:15 +01:00
Reid Rankin 16212432c9 G20/21 and M149 support, and code_value() refactor 
This is an update of MarlinDev PR #196.

G20/21: support for switching input units between millimeters and
inches.
M149: support for changing input temperature units.

In support of these changes, code_value() and code_value_short() are
replaced with an array of functions which handle converting to the
proper types and/or units.
 2016-06-08 16:51:10 -07:00
Scott Lahteine cd441ce652 SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
Scott Lahteine db0fd021d0 Z raise options independent of ABL so G28 can use them 2016-06-02 16:56:49 -07:00
Scott Lahteine 28fb1f8994 Tweak #endif comment for ABL GRID 2016-06-02 16:56:49 -07:00
Scott Lahteine a0b000d752 Support for SAV_3DGLCD OLED LCD controller 2016-05-31 14:41:16 -07:00
Edward Patel 06593833ff MBL: Move border macros to Configuration_adv.h 2016-05-30 20:50:16 +02:00
Edward Patel 92a27c37b3 MBL: Apply https://github.com/MarlinFirmware/Marlin/pull/3903 to example_configurations 2016-05-30 09:50:11 +02:00
Scott Lahteine fe3122774a Merge pull request #3806 from thinkyhead/rc_coreyz_support 
Support for COREYZ. Fixes for COREXY, COREXZ
 2016-05-26 18:50:43 -07:00
Scott Lahteine 89e630b2fb Merge pull request #3808 from thinkyhead/rc_singlenozzle 
SINGLENOZZLE
 2016-05-23 15:52:19 -07:00
Scott Lahteine 95fee8ca81 Add option for CoreYZ kinematics 2016-05-23 13:58:40 -07:00
Scott Lahteine c5130fd23b Additional instructions for controller reverse options 2016-05-20 18:14:50 -07:00
Scott Lahteine 69abfef82e Add "SINGLENOZZLE" extruder option 2016-05-20 15:45:11 -07:00
Scott Lahteine 1a6c72cb57 Apply to the rest of the configs 2016-05-20 11:52:27 -07:00
Scott Lahteine 8218558953 Update comments, rename next_ping_ms, followup to #3797 2016-05-19 16:44:57 -07:00
Scott Lahteine 07c9a11c3c Automatically set X2 stepper pins 2016-05-18 19:09:09 -07:00
Scott Lahteine 3016dfe484 Merge pull request #3744 from thinkyhead/rc_bezier_curves 
Add BEZIER_CURVE_SUPPORT — G5 command
 2016-05-17 13:57:38 -07:00
João Brázio f9a62f6a8e Added PRINTJOB_TIMER_AUTOSTART section to example config files 2016-05-14 15:22:45 -07:00
Scott Lahteine ddac17a195 Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ) 2016-05-14 14:52:08 -07:00
Scott Lahteine 9f6b8f7d5b Remove extra @section directive from configs 2016-05-14 14:51:09 -07:00
Scott Lahteine f13c4a9ec4 Merge pull request #3720 from jbrazio/feature/host-keepalive 
Removes the DISABLE from HOST_KEEPALIVE
 2016-05-14 14:39:31 -07:00
AnHardt b74af78736 Make arc support (G2/G3) configurable 
Saves about 2669 bytes when deactivated. (About 1% for a AT2560, about __4%__ for a AT644!)
 2016-05-13 13:27:45 +02:00
Scott Lahteine 14cd0f4c92 Merge pull request #3740 from thinkyhead/rc_lcd_home_options 
Individual Axis Homing LCD menu items
 2016-05-12 11:59:46 -07:00
João Brázio 09150cae79 Individual Axis Homing LCD menu items 2016-05-11 19:28:19 -07:00
Scott Lahteine 4dc4e2063f Add REVERSE_ENCODER_DIRECTION option 2016-05-11 15:39:28 -07:00
João Brázio 85b2c80838
Updated example configurations 2016-05-11 01:45:49 +01:00
João Brázio 5373ac6373
Updated example configurations 2016-05-10 13:42:00 +01:00
esenapaj 212b17d510 Fix for PR #3526(Configuration.h LCD & SDCard s... 
Fix for PR #3526(Configuration.h LCD & SDCard section rewrite)

It removes duplicated BQ_LCD_SMART_CONTROLLER.
 2016-05-03 21:35:02 +09:00
esenapaj 2fa4bc344c Some clean-up for example configuration files 
Some clean-up for example configuration files

Follow-up and fix the PR #3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR #3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR #3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR #3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
 2016-05-02 21:16:00 +09:00
Scott Lahteine fbf69081b4 Updated comment for THERMAL_PROTECTION_BED 2016-05-01 13:12:51 -07:00
gralco 908229dbb3 Introduce temp watch protection for the bed 
When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function.

Conflicts:
	Marlin/Configuration_adv.h
 2016-05-01 13:12:51 -07:00
Scott Lahteine c3ef9993b9 Merge pull request #3625 from jbrazio/feature/print-counter 
Print job statistics
 2016-04-29 15:31:14 -07:00
João Brázio e34f4653ef
Fixed a typo on the configuration files 2016-04-29 23:13:59 +01:00
João Brázio 27088e356f
Updated example configuration files 2016-04-29 23:13:59 +01:00
Scott Lahteine 924285afa6 Merge pull request #3641 from thinkyhead/rc_reverse_menu_doc 
Correct the REVERSE_MENU_DIRECTION comment
 2016-04-28 20:28:46 -07:00
Scott Lahteine f1b00eb12b Correct the REVERSE_MENU_DIRECTION comment 2016-04-28 20:27:17 -07:00
Scott Lahteine 0c11566f42 Replace LANGUAGE_INCLUDE with LCD_LANGUAGE 2016-04-27 20:06:40 -07:00
Scott Lahteine 259794c0be Make DISPLAY_CHARSET_HD44780 a single setting 2016-04-27 20:06:40 -07:00
João Brázio 7de0161204
Updated example config files 2016-04-24 05:21:17 +01:00
Scott Lahteine 0c2aa92b07 Z Safe Homing for all 
The `Z_SAFE_HOMING` feature is coupled with probes and not leveling, so
make it available for general use.
 2016-04-20 17:04:52 -07:00
Scott Lahteine 339b5b3e34 Patch more configs with new changes 2016-04-16 19:35:02 -07:00
Scott Lahteine a8e4d7c135 Merge pull request #3477 from alephobjects/BedTempHysteresis 
Implementation of M190 bed temp hysteresis
 2016-04-15 16:20:58 -07:00
Scott Lahteine 1cc622b167 Fix minor spelling in comments 2016-04-14 20:06:59 -07:00
Scott Lahteine de8c0baf8b Update some comments in Configuration.h 2016-04-14 16:41:20 -07:00
gralco 69c00aea4c Include bed hysteresis setting in the example configs 2016-04-14 08:03:38 -06:00
Scott Lahteine f8e10ff1d8 Merge pull request #3491 from thinkyhead/rc_mechanical_probe 
Support for "mechanical probe" with Allen Key as a special case
 2016-04-13 20:55:14 -07:00
Scott Lahteine 7eb476597f Update some comments in Configuration.h 2016-04-13 20:34:42 -07:00
esenapaj 2eb1b102f8 Support for "mechanical probe" with Allen Key as a special case 2016-04-13 20:34:12 -07:00
Scott Lahteine 50c3140040 Merge pull request #3414 from thinkyhead/rc_host_timeout_mods 
Host Keepalive configurable timeout with 2s default
 2016-04-08 21:45:45 -07:00
jbrazio dd3a06a95a Implemented M155 and M156, a generic TWI/I2C interface for Marlin 2016-04-08 20:14:37 -07:00
Scott Lahteine 2eca8d63b3 Add DEFAULT_KEEPALIVE_INTERVAL setting 2016-04-07 19:25:56 -07:00
Scott Lahteine 868eebfdee Simplify configuration of Z2 endstops 2016-04-02 16:39:23 -07:00
Scott Lahteine e5771346a4 Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags 2016-04-02 16:39:23 -07:00
Scott Lahteine 2ee599d873 Merge pull request #3321 from tnw513/fix_max_endstop 
Max endstops disabled for stock Prusa i3 Hephestos.
 2016-04-02 16:38:10 -07:00
Silvio Didonna 6c528e63eb max endstops disabled. Stock Prusa i3 Hephestos have min endstops. 2016-04-02 16:54:59 +02:00
Scott Lahteine ffe054c129 Fix comment about host keepalive interval 2016-04-01 17:28:08 -07:00
Scott Lahteine 1a79b13b7a FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR 2016-03-29 20:54:31 -07:00
Scott Lahteine 3b2d159abd Relax the test for "Heating failed" errors 2016-03-27 07:02:10 -07:00
Scott Lahteine 53cc6cca46 Formalize some dependencies on PIDTEMPBED 2016-03-25 23:50:28 -07:00
Scott Lahteine 4b31c67dce Add PID_AUTOTUNE_MENU option 2016-03-25 19:31:56 -07:00
Scott Lahteine e08915a723 Fix comments in Configuration_adv.h 2016-03-25 19:31:31 -07:00
Scott Lahteine 0da744b7b0 Further cleanup of comments, partial Doxygen-style 
Following up on #3231
 2016-03-25 00:45:56 -07:00
jbrazio 5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
Scott Lahteine da9d4c4caf Merge pull request #3206 from esenapaj/patch-5 
Follow-up the PR #3082, etc
 2016-03-24 00:20:25 -07:00
esenapaj fc75e6f92d Follow-up the PR #3082, etc 
Follow-up the PR #3082
Follow-up the commit 143ad74: unnoticed updates
Fix for commit b0f5ba0: Z offset: -front [of the nozzle] +behind -> Y offset: -front [of the nozzle] +behind
Standardize the writing method: Z-probe, z-probe -> Z Probe
Adjust spacing
 2016-03-22 20:22:01 +09:00
esenapaj 22299c13c1 Change link to the document 
documentation/LCDLanguageFont.md moved to http://www.marlinfirmware.org/ at commit 12d0983757,
but http://www.marlinfirmware.org/ isn't working.
 2016-03-22 19:58:41 +09:00
Scott Lahteine be08eb6153 Merge pull request #3194 from jbrazio/feature/add-pt_pt-utf8 
Add pt_pt-utf8 language pack and fix some minor compiler warnings
 2016-03-20 17:42:45 -07:00
Scott Lahteine d1ff7959b7 Merge pull request #3188 from esenapaj/patch-1 
follow-up the commit b82d91e
 2016-03-20 17:39:52 -07:00
Scott Lahteine 1cc316f1fd Merge pull request #3082 from thinkyhead/updated_2820 
This is quite comprehensive. If probes are disabled in any case when they shouldn't be, I'm sure we will hear about it soon.
 2016-03-20 17:10:38 -07:00