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

558 commits

Author SHA1 Message Date
João Brázio
aa5a4716cf
Update default config 2016-05-10 13:37:21 +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
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
e2da7e5000
Updated the default configuration and fixed a printcounter.h typo 2016-04-29 23:13:58 +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
170f7e8a45
Rework Marlin's versioning system 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
ef2fd620e9 Suggested fixups for LCD/SD config comments 2016-04-16 19:35:02 -07:00
João Brázio
7b5d6ba315 Rebase & feedback 2016-04-16 19:35:02 -07:00
João Brázio
36a49eab1c Improved the LCD and SD comments blocks in Configuration.h 2016-04-16 19:32:41 -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
gralco
178aeb79c8 Implementation of M190 bed temp hysteresis 2016-04-12 08:56:14 -06:00
Scott Lahteine
2eca8d63b3 Add DEFAULT_KEEPALIVE_INTERVAL setting 2016-04-07 19:25:56 -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
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
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
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
jbrazio
92a7d4515a Missing coma comment correction for the default cofig file 2016-03-20 23:23:11 +00:00
jbrazio
68dda08fff Added pt_pt-utf8 language pack; Fixed some minor compiler warnings; Harmonize file suffix for the current existing UTF8 language packs; Updated all configuration files to reflect the new language packs 2016-03-20 23:14:24 +00:00
esenapaj
468df96b0f follow-up the commit b82d91e 
follow-up the commit b82d91eca6
 2016-03-20 20:57:14 +09:00
Scott Lahteine
32f75749e4 Merge pull request #3117 from Blue-Marlin/thermal-protection 
Improve the descriptions for THERMAL_PROTECTION
 2016-03-19 23:41:05 -07:00
Scott Lahteine
4119cef32f Merge pull request #3180 from clexpert/RCBugFix 
Czech language specific changes
 2016-03-19 20:18:05 -07:00
CoderSquirrel
eda95d8bed Add support for LCM1602 16x2 I2C LCD adapter 2016-03-19 19:26:44 -07:00
Petr Zahradnik
98392782ea Update Configuration.h 2016-03-19 20:45:13 +01:00
Blue-Marlin
3166aed087 Improve the descriptions for THERMAL_PROTECTION 2016-03-19 14:08:59 +01:00
AnHardt
3f45a1acf9 Check probes only when deployed 
Aim: Test probes in update_endstops only when activated

Changes:
Configurations
 Add define for FIX_MOUNTED_PROBE to handle the situation where formerly ENDSTOPS_ONLY_FOR_HOMING had to be set, or lowering the nozzle below Z_PROBE_OFFSET_FROM_EXTRUDER could give an "endstop hit" message.
 Add define for Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to indicate a common situation, that we have a probe but it is connected to an endstop pin
 Add some comments
 Shift some entries to have related things together.

Conditionals.h
 We have a probe (HAS_Z_MIN_PROBE) if one of the pins is defined AND one of the probes is defined.

SanityCheck.h
 Add some tests if the probe is connected and if we have defined a probe.

stepper.cpp
 Changes to test the probe only when it is deployed (z_probe_is_active).
 Test update_endstops() when the probe is deployed.

MarlinMain.cpp
 a. set and reset z_probe_is_active in deploy_z_probe(), stow_z_probe() and dock_sled()
 b. set and reset z_probe_is_active in the case a z-servo is moved to a defined position. The only remaining unhandled servo move is in M280 where we do not end in a defined position. If you want to handle a probe use M401/402
 c. skip deploying/stowing when already deployed/stowed in the dedicated deploy/stow functions.
 d. Handle the new FIX_MOUNTED_PROBE in parallel to a servo driven probe/endstop.

 To do: In another PR. handle all probes in deploy/stow_z_probe.
 Sort out SERVO_LEVELING vs. HAS_SERVO_ENDSTOPS.
 2016-03-19 02:00:08 -07:00
Scott Lahteine
7ec7bb31c4 Send a Busy signal to hosts during long processes, wait for input, etc 
If Marlin is blocking the serial input or command queue for any length
of time (for example more than 2 seconds), it needs to send a message
to serial out to inform the host that it is busy. Marlin should only
send these messages out when busy, and preferably not when trying to
print formatted output.
 2016-03-18 22:38:35 -07:00
Scott Lahteine
b8b51d8da8 Add the REVERSE_MENU_DIRECTION option 2016-03-16 04:02:40 -07:00
Scott Lahteine
1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion 
Wrap macros to prevent bad expansions
 2016-03-15 00:25:34 -07:00
Scott Lahteine
30c3a21d1f Merge pull request #3112 from thinkyhead/rc_support_MAX31855 2016-03-13 03:30:48 -07:00
Scott Lahteine
f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00