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

2349 commits

Author SHA1 Message Date
Natealus
585eee6549 Z Probe inverting not present in example configs, causes error 
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
 2015-04-08 18:57:30 -06:00
Scott Lahteine
4788b59300 Thermistor values for configurator 2015-04-08 03:12:21 -07:00
Scott Lahteine
bb917ecda8 Merge pull request #1853 from thinkyhead/dev_version 
Set version to "1.0.3 dev"
 2015-04-08 01:57:51 -07:00
Scott Lahteine
caa7734402 Merge pull request #1864 from thinkyhead/is_running 
IsStopped / IsRunning inline
 2015-04-08 01:10:36 -07:00
Scott Lahteine
3162971cd6 current_position not static 2015-04-08 01:05:39 -07:00
Scott Lahteine
27cb90da8b IsStopped / IsRunning inline 2015-04-08 00:56:19 -07:00
Max
07fc2b5b70 Update language_ru.h 2015-04-08 13:18:45 +06:00
Scott Lahteine
756bb5e268 Cleanup formatting in hitachi & dogm lcd 2015-04-07 22:04:10 -07:00
Scott Lahteine
7431ef7e2d Merge branch 'Development' into dev_version 
Latest upstream commits
 2015-04-07 21:14:00 -07:00
Scott Lahteine
43773ff735 Formatting and lcd contrast masking 2015-04-07 21:11:03 -07:00
Scott Lahteine
eb6e3886f4 Set version to "1.0.3 dev" 2015-04-07 20:38:43 -07:00
Scott Lahteine
cf9b58452c Minimum delay in menu click feedback 
Squished #1849
 2015-04-07 20:20:30 -07:00
Scott Lahteine
1d291be2ba Fix de after PREVENT_DANGEROUS_EXTRUDE 
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
 2015-04-07 20:01:08 -07:00
Scott Lahteine
e03da4805b Merge pull request #1774 from epatel/Development 
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
 2015-04-07 19:24:46 -07:00
Scott Lahteine
f7c4e7e19f Fix G29 not deploying in some instances 2015-04-07 15:38:29 -07:00
Edward Patel
a9ed39b12d Moved checks into SanityCheck.h + removed previous added checks. 2015-04-07 22:58:08 +02:00
Edward Patel
002340f32c Merge branch 'Development-Marlin' into Development 2015-04-07 22:49:12 +02:00
Scott Lahteine
c379f17117 Encapsulate setting of homing_bump_feedrate 2015-04-06 23:21:33 -07:00
Scott Lahteine
7d2c2f1790 Updates for the configurator 
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
 2015-04-06 23:16:01 -07:00
Scott Lahteine
967db181d0 Latest upstream commits 2015-04-06 21:46:18 -07:00
Scott Lahteine
e502144eda Fixup formatting of last commit 2015-04-06 21:28:14 -07:00
Scott Lahteine
d05efa008d Merge pull request #1825 from shaggythesheep/bugfix_no_heaters 
Bugfix: Temperature checks when no heaters in use
 2015-04-06 21:25:22 -07:00
Scott Lahteine
d20f42c883 Don't stow the probe until the last grid point! 
- Address Issue #1682 at hash #issuecomment-89756858
 2015-04-06 20:58:09 -07:00
Scott Lahteine
5c2bb05af3 Merge pull request #1839 from AnHardt/fix-statusmessage 
Fix lcd_status_message
 2015-04-06 19:08:25 -07:00
Scott Lahteine
d70a4a3847 Merge pull request #1823 from AnHardt/splashscreen 
Disable splash-screen when done once
 2015-04-06 18:48:48 -07:00
Scott Lahteine
56aea5f8e5 Merge pull request #1829 from Natealus/Development 
Azteeg X3 Pro Pin fix ups
 2015-04-06 18:19:33 -07:00
Scott Lahteine
6a860b99dc Merge pull request #1828 from Wackerbarth/Configurator 
Update Configurator Files
 2015-04-06 18:09:26 -07:00
AnHardt
ac843fbf3b Fix lcd_status_message 
Because we now can use utf8 with up to 3 bytes per symbol,
lcd_status_message[] must be 3*LCD_WIDTH wide.
Filling up the message, or cutting to length, are fixed to.

Fix for #1832 about at the end.
 2015-04-07 02:33:34 +02:00
Scott Lahteine
6d084c017f Fix typo in FWRETRACT handler 
Should be `retracting` and not `retract`
 2015-04-06 17:04:22 -07:00
Edward Patel
d27c82a450 Added check for Delta printers in Mesh, #error not yet supported. 2015-04-06 23:03:06 +02:00
Edward Patel
9a093b2e8f Added #error + mention not to enable ABL and Mesh at the same time 2015-04-06 19:38:59 +02:00
AnHardt
6ae714894e Now the simplycistic solution. 
Just and only display splashscreen only once.
 2015-04-06 12:43:38 +02:00
AnHardt
d521693641 Revert "Draw content in display loop only when needed" 
This reverts commit bf04a92cc0.
 2015-04-06 12:31:31 +02:00
Natealus
b6f2bff461 Azteeg X3 Pro Pin fix ups 2015-04-05 23:34:56 -06:00
Scott Lahteine
d867c18535 Fix compile error with Z_DUAL_ENDSTOPS 2015-04-05 20:48:08 -07:00
Richard Wackerbarth
46474cf2f2 Incorporate @section headers from configurator 2015-04-05 22:39:40 -05:00
Richard Wackerbarth
cf66cb8808 Bring configurator up-to-date 2015-04-05 22:38:15 -05:00
Richard Miles
1a5293c2ce Prevents MINTEMP / MAXTEMP when no heaters present 
This commit checks whether or not HEATER_0 is in use, and if not, skips
the MIN / MAX temperature checks.
 2015-04-05 22:27:14 +01:00
Edward Patel
5360158545 Merge branch 'Development-Marlin' into Development 2015-04-05 20:28:44 +02:00
AnHardt
bf04a92cc0 Draw content in display loop only when needed 
Example for splash screen.
 2015-04-05 12:53:20 +02:00
AnHardt
9865318f1c Disable splash-screen when done once 
Splash screen was shown with every display init.
That means every time the menus where entered.

Note the 2 in the initialisation.
The buffer is already written in two steps a 512 byte.
Without the 2 only the upper half is shown.
 2015-04-05 12:24:01 +02:00
Scott Lahteine
53eb662908 Have the configurator read from MarlinFirmware repo 2015-04-04 20:19:17 -07:00
Edward Patel
d24ea7c03f Added Comment in hope of github seeing these updates 2015-04-05 05:14:06 +02:00
Edward Patel
61de6ecd54 Added change to example Configuration.h's 2015-04-05 04:26:35 +02:00
Edward Patel
2f0081bbb5 Compile error fix! Fix for merge artifacts. 2015-04-05 04:16:16 +02:00
Edward Patel
0e6514e7bd Bug fix! Missed putting z value back in right slot after zigzag mod. 2015-04-05 04:13:34 +02:00
Edward Patel
ea10601406 Merge branch 'Development-Marlin' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-04-05 04:06:02 +02:00
Scott Lahteine
cb02bc6db4 Merge pull request #1817 from AnHardt/dogm_looptest 
Execute DOGM display-loop less often
 2015-04-04 17:29:56 -07:00
quillford
b02a55e60f Fixed scara directions 
Config said for a delta instead of for a scara
 2015-04-04 15:26:35 -07:00
Scott Lahteine
6c5f07c5cb Merge pull request #1813 from thinkyhead/fixup_probing 
Fix bad thermal runaway trigger
 2015-04-04 14:41:43 -07:00