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

3407 commits

This branch
This branch
All branches
Author SHA1 Message Date
MagoKimbra 4db8d2def4 Moved MSG_DEBUG in language.h 2015-06-03 08:18:27 +02:00
MagoKimbra 76306f9073 Insert Debug DRYRUN Repetier Host compatible 2015-06-01 18:34:45 +02:00
MagoKimbra 881146bc22 Fix problem Width Cura 2015-06-01 17:25:32 +02:00
Bo Herrmannsen c33fffd6a7 Merge pull request #2209 from AnHardt/u8glib 
Replace U8GLI v1.11 with v1.17
 2015-06-01 07:01:59 +02:00
Bo Herrmannsen 01a7b5cc97 Merge pull request #2210 from fmalpartida/bugFixing 
Addes support for SDD1306 I2C OLED LCD
 2015-06-01 07:01:35 +02:00
Bo Herrmannsen cc5d006087 Revert "updated addons for IDE 1.6.4" 
This reverts commit 2724baae8b.
 2015-06-01 07:00:30 +02:00
Bo Herrmannsen 2724baae8b updated addons for IDE 1.6.4 2015-05-31 23:52:39 +02:00
fmalpartida 11e3f3375d Merge commit '764e61708b8e73410c7819d59c4970d7089ca6f5' into bugFixing 
Updated LCD wiki location.
 2015-05-31 21:20:26 +02:00
AnHardt 6f4873329e Replace U8GLI v1.11 with v1.17 
In Travis we already test against 1.17.
 2015-05-31 20:25:36 +02:00
AnHardt 764e61708b Merge pull request #2208 from alexxy/ru_translations 
Update ru translation
 2015-05-31 19:46:59 +02:00
Alexey Shvetsov a8670b66a7 Update ru translation 
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2015-05-31 20:09:10 +03:00
fmalpartida 93da52d011 Added support for OLED SSD1306 I2C based LCDs. 2015-05-31 18:53:29 +02:00
Wurstnase 9c09967803 Merge pull request #2149 from Wurstnase/enstop_bits 
faster compare
 2015-05-31 16:02:55 +03:00
wurstnase 0f3f7d6835 clean up double endstops 2015-05-31 14:06:13 +02:00
AnHardt 9d2a980bcf Merge pull request #2170 from thinkyhead/beep_M600_elsewise 
Slight size reduction by adding idle()
 2015-05-30 12:42:32 +02:00
AnHardt 2728dc0606 Merge pull request #2194 from thinkyhead/reduce_strings 
Redo "invalid extruder" to save 304 bytes
 2015-05-30 11:05:08 +02:00
Scott Lahteine be5236e839 Reduce setTargetedHotend by removing the switch 2015-05-29 18:03:58 -07:00
Scott Lahteine 06f401e7e5 Redo "invalid extruder" to save 264 bytes 
- Use `setTargetedHotend` in `M200`, as with other commands that use
`T` for the extruder
- Synthesize the "invalid extruder" message, obviating several long
strings
 2015-05-28 22:25:28 -07:00
Scott Lahteine 1a882bcc2e Merge pull request #2193 from thinkyhead/ignore_unrecognized_commands 
Ignore unknown commands if they start with G, M, or T
 2015-05-28 22:03:48 -07:00
Scott Lahteine a672872717 Merge pull request #2187 from AnHardt/MAX6675M105 
Print active extruder with M105 for MAX6675
 2015-05-28 18:12:48 -07:00
Scott Lahteine 9beed830eb Drop commented code_is_good lines 2015-05-28 17:53:47 -07:00
Scott Lahteine 068d4a1eb2 Ignore unknown commands if they start with G, M, or T 2015-05-28 17:44:09 -07:00
Scott Lahteine 5824f613ff Merge pull request #2185 from jothan/bed_integral 
Separate the maximum integral power for the bed from PID_INTEGRAL_DRI…
 2015-05-28 16:32:02 -07:00
Scott Lahteine c5c9d12630 Merge pull request #2183 from AnHardt/displayinit 
Initialize the display earlier
 2015-05-28 16:29:18 -07:00
Scott Lahteine ef4becc413 Merge pull request #2188 from AnHardt/FtoN 
Replace MSG_F? with MSG_N?
 2015-05-28 16:18:50 -07:00
Scott Lahteine eecabf0b00 Merge pull request #2190 from thinkyhead/new_parser_m33 
Update M33 for new gcode parser
 2015-05-28 16:17:32 -07:00
Scott Lahteine 0564625757 Update M33 for new gcode parser 2015-05-28 14:17:39 -07:00
AnHardt f18f689c01 Replace MSG_F? with MSG_N? 
To avoid double definitions.
I prefer to read N for Number not for Nozzle.
 2015-05-28 20:30:23 +02:00
AnHardt af7e3f5076 Print active extruder with M105 for MAX6675 
Was omitted when T0 is a MAX6675.
 2015-05-28 19:03:16 +02:00
Jonathan Bastien-Filiatrault d46d9d998e Add maximum bed integral term in example configurations. 2015-05-28 12:51:37 -04:00
Jonathan Bastien-Filiatrault e86f2342c0 Separate the maximum integral power for the bed from PID_INTEGRAL_DRIVE_MAX / PID_MAX. 
My PID_INTEGRAL_DRIVE_MAX was at 96, which was insufficient for my bed
to reach its intended temperature. The head requires a low maximum power since
I run on 24 volts and it has a somewhat low thermal mass.
 2015-05-28 11:48:04 -04:00
AnHardt a8a8f236d2 Merge pull request #2180 from thinkyhead/fix_radian 
Fix DEGREES macro
 2015-05-28 16:19:41 +02:00
AnHardt f0523b5816 Initialize the display earlier 
to have it ready to display errors during (temperature)-setup.
 2015-05-28 16:08:17 +02:00
Scott Lahteine 790c697c19 Fix DEGREES macro 2015-05-28 00:19:48 -07:00
Scott Lahteine 76b4678f99 Merge pull request #2171 from thinkyhead/gcode_110_is_good 
M110 is a known command
 2015-05-26 21:17:58 -07:00
Scott Lahteine 03d5709b09 M110 is a known command 
- The command parser now displays “unknown command” in more cases.
Known commands must be added to the `switch` inside `process_commands`
to suppress the error.
 2015-05-26 20:31:18 -07:00
Scott Lahteine d76a01194d Slight size reduction by adding idle() 2015-05-26 20:08:21 -07:00
Scott Lahteine 22c8bc5ef4 Merge pull request #2157 from AnHardt/bed-mintemp 
Activate BED_MINTEMP error
 2015-05-26 17:49:37 -07:00
Scott Lahteine 97a48e36e9 Merge pull request #2156 from AnHardt/kill3 
Call kill() only once when triggered by a temperature error
 2015-05-26 15:34:47 -07:00
AnHardt da246f5cb1 Activate BED_MINTEMP error. 
And call _temp_error() directly for ERR_MAXTEMP_BED to avoid the only one time use of bed_max_temp_error().

Includes #2156.
 2015-05-25 13:23:19 +02:00
AnHardt 959da98d8e Call kill() only once when triggered by a temperature error 
to avoid stack overflow when called from interrupt.

Some clean up for calls of disable_all_heaters().
'disable_all_heaters()' is called in kill() and again when 'killed' is already set inside _temp_error().
 2015-05-25 12:44:03 +02:00
Scott Lahteine ffc39dc182 Merge pull request #2153 from thinkyhead/leveling_shrink 
Reduce code size with out_of_range_error function
 2015-05-24 20:32:51 -07:00
Scott Lahteine 68f6f149d0 Reduce code size with out_of_range_error function 
- Affects code size when automatic bed leveling is enabled
 2015-05-24 20:18:02 -07:00
Scott Lahteine f8aabd670e Notes about Development in its README.md 2015-05-24 18:47:00 -07:00
wurstnase 94120740d8 faster compare 
!(~(ab)&0x3) and ab == 0x3 are equal
 2015-05-23 07:55:15 +02:00
Scott Lahteine c9141e604a Merge pull request #2145 from thinkyhead/gcode_folding 
Indentation in process_commands
 2015-05-22 18:47:37 -07:00
Scott Lahteine 3778362f88 Merge pull request #2143 from thinkyhead/fix_command_parser_M110 
Cleanup pins in RAMPS_13_EFB boards
 2015-05-22 18:47:10 -07:00
Scott Lahteine b55f8718c3 Indent G90/G91, G92 2015-05-22 17:34:08 -07:00
Scott Lahteine b0d520b109 Indent G30, G31/G32 2015-05-22 17:33:17 -07:00
Scott Lahteine ffe27a6225 Indent G29 2015-05-22 17:32:46 -07:00