3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-12-18 16:27:17 +00:00
Code Issues Releases Wiki Activity
5,506 Commits 22 Branches 85 Tags 2 GiB
ead155399f
Commit Graph

5506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
João Brázio
9589e51810
Disable DEBUG_PRINTCOUNTER 2016-04-29 23:13:59 +01:00
João Brázio
484de24e22
Updated travis to test for PRINTCOUNTER 2016-04-29 23:13:58 +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
João Brázio
d6cfcc9c8b
Added new G-Code: M78 2016-04-29 23:13:58 +01:00
João Brázio
4f541c5bb5
Added a new object: PrintCounter 2016-04-29 23:13:58 +01:00
João Brázio
26b166d7cf
Made all stopwatch::debug() calls static 2016-04-29 23:13:58 +01:00
Scott Lahteine
5897b58a70 Merge pull request #3634 from esenapaj/patch-2 
Update distribution date and readme again
 2016-04-28 21:19:08 -07:00
Scott Lahteine
f4706bb90e Keepalive not needed while waiting for temperatures 2016-04-28 21:11:15 -07: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
8905908081 Merge pull request #3632 from thinkyhead/i3_millie_language_fun 
Simplified LCD Language settings
 2016-04-28 19:52:10 -07:00
esenapaj
c7e4b3044b Change "RC6" to "RCBugFix" on top part of the readme, etc 
・Change "RC6" to "RCBugFix" on top part of the readme
・Unify distribution date of RCBugFix and RC6
・Move comments about IDE version from RCBugFix section to RC6 section
 2016-04-28 20:30:39 +09:00
Scott Lahteine
6c48852b20 Update distribution date 2016-04-28 18:06:53 +09:00
Scott Lahteine
2142d5a62e Merge pull request #3627 from Blue-Marlin/German-again-and-again-and-agin 
Correct an error in lang_de
 2016-04-27 20:14:15 -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
Scott Lahteine
a5d00f755b Merge pull request #3619 from esenapaj/patch-2 
Update distribution date and readme
 2016-04-27 19:52:30 -07:00
Blue-Marlin
e89f01d044 Correct an error in lang_de 
There is no way to translate "A-travel" to "A Rückzug". Thats simply
wrong.
 2016-04-27 12:59:48 +02:00
esenapaj
ee2f37f3cc Update distribution date and readme 
It sync with the RC.
 2016-04-27 11:21:51 +09:00
Paul Philippov
2d89b5527f fixed link to wiki 2016-04-27 11:19:46 +09:00
Scott Lahteine
ad0f70f2f3 Merge pull request #3620 from Blue-Marlin/feedrate_atfer_toolchange 2016-04-26 17:33:15 -07:00
Scott Lahteine
d58c5ac446 Merge pull request #3618 from esenapaj/patch-1 2016-04-26 17:20:04 -07:00
Scott Lahteine
2bb5cf5291 Merge pull request #3622 from floyd871/patch-1 2016-04-26 17:14:36 -07:00
Scott Lahteine
6d98f47d1c Merge pull request #3623 from jbrazio/cleanup/convert2unix 2016-04-26 17:13:22 -07:00
Blue-Marlin
e58e281473 Fix feedrate after toolchange 
The fix is simple. Most changes are because of changed indendation,
bacause of leaving early for wrong tool number
 2016-04-27 00:57:45 +02:00
João Brázio
32d798fcc7
Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
Michael Neumann
59cfc84dad German "Umlaute" 
We don't have to  avoid German "Umlaute" any more.
 2016-04-26 21:52:05 +02:00
Matt Keveney
4dfc496965 added recalc_delta_settings() call in Config_RetrieveSettings. Appears to be necessary any time delta-related parameters (M665) are modified 2016-04-26 20:01:53 +09:00
Scott Lahteine
ec82e1e05d Merge pull request #3616 from thinkyhead/rc_fixup_some_movement 
General cleanup around high level move functions
 2016-04-25 20:23:38 -07:00
Scott Lahteine
abeab792cb General cleanup around high level move functions 
- Use new `DEBUG_POS` macro for `DELTA` debug
- Neaten up `prepare_move` a smidgen
- Remove an old commented `prepare_move()` line
 2016-04-25 20:02:24 -07:00
Scott Lahteine
66540f8b84 Merge pull request #3615 from thinkyhead/rc_whats_up_with_M112 
Report current position to host after M206 / M428
 2016-04-25 18:58:41 -07:00
Scott Lahteine
68d0347e67 Call report_current_position after M206 / M428 2016-04-25 18:43:28 -07:00
Scott Lahteine
dcb4cdaa9e Call report_current_position instead of gcode_M114 directly 2016-04-25 18:43:27 -07:00
Scott Lahteine
e38baaa23e Fix an acceleration anomaly by making locals signed 2016-04-25 14:17:20 -07:00
Scott Lahteine
dd26c67bab Merge pull request #3612 from jbrazio/feature/stopwatch-misc 
Renamed stopwatch::status to stopwatch::state
 2016-04-25 12:36:34 -07:00
João Brázio
739dcda0f1
Renamed stopwatch::status to stopwatch::state 2016-04-25 17:40:43 +01:00
gralco
840e13f664 Introduce M108 cancel heatup for the hotend and bed 
This G-code is asynchronously handled in the get_serial_commands() parser.
 2016-04-25 08:33:33 -06:00
Scott Lahteine
df2d0eb37c Merge pull request #3608 from thinkyhead/rcbugfix_merge_rc 
Merge RC => RCBugFix changes since RC5
 2016-04-24 20:28:25 -07:00
esenapaj
db56ff5881 follow-up to commit 200b248(Update README.md) 
follow-up to commit 200b2487c2

Update release date in another place
 2016-04-24 20:16:37 -07:00
Jochen Groppe
0ed43ec34b Update README.md 
Oops! at least 1.6.0
 2016-04-24 20:16:37 -07:00
Jochen Groppe
b899338c32 Update README.md 
* Description for RC5
* Hint for deprecated Arduino versions
 2016-04-24 20:16:36 -07:00
Scott Lahteine
735f1f5bfa Merge pull request #3606 from thinkyhead/rc_step_sec_comments 
Patch steps rate comment in trapezoid function
 2016-04-24 19:48:41 -07:00
Scott Lahteine
fce1e843b9 Patch steps rate comment in trapezoid function 2016-04-24 19:38:58 -07:00
Scott Lahteine
266ae90861 Merge pull request #3594 from jbrazio/feature/rework-versioning 
Rework Marlin's versioning system
 2016-04-24 17:42:45 -07:00
João Brázio
aa7a65e613
Updated travis config 2016-04-24 05:57:14 +01:00
João Brázio
7de0161204
Updated example config files 2016-04-24 05:21:17 +01:00
João Brázio
3b6f75511f
Updated multiple pins files 2016-04-24 05:21:17 +01:00
João Brázio
170f7e8a45
Rework Marlin's versioning system 2016-04-24 05:21:17 +01:00
Scott Lahteine
c86d092ef3 Merge pull request #3598 from esenapaj/patch1 
Cleanup for language files
 2016-04-22 21:55:42 -07:00
esenapaj
8d0b2f358a Cleanup for language files 
・Remove abolished strings (MSG_NOZZLE1, MSG_NOZZLE2)
・Remove duplicated strings 
・Arrange the strings in unified order
・Adjust spacing
・Remove some comments in Japanese files(follow-up the PR #3560)

The most part of these changes were salvaged from closed my PR#3550.
 2016-04-23 13:27:05 +09:00