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

4315 commits

This branch
This branch
All branches
Author SHA1 Message Date
João Brázio
55a248d6b4 Fixes #3313 : Wrong board def in pins.h 2016-04-02 09:28:58 +01:00
Scott Lahteine
4d0d37aab7 Merge pull request #3309 from thinkyhead/rc_release_RC5 
Release 1.1.0-RC5
 2016-04-01 19:23:30 -07:00
Scott Lahteine
6a245fe4f7 Release 1.1.0-RC5 2016-04-01 19:14:49 -07:00
Scott Lahteine
e8f8a46ef5 Merge pull request #3303 from thinkyhead/rc_various_fixes 
Various patches for LCD menu issues
 2016-04-01 18:02:25 -07:00
Scott Lahteine
b98f72b483 Small optimization for ftostr43 2016-04-01 17:54:16 -07:00
Scott Lahteine
a393941d2d Combine "XYZ" with MSG_LEVEL_BED_HOMING 2016-04-01 17:51:03 -07:00
Scott Lahteine
097cc75ba8 Patch _lcd_level_bed draw to fix flicker, show proper offset 2016-04-01 17:51:03 -07:00
Scott Lahteine
1e1a18e091 Remove extra semicolon in ultralcd.cpp 2016-04-01 17:51:03 -07:00
Scott Lahteine
0b4f65dca8 Always limit blink to ~1 second intervals 2016-04-01 17:51:03 -07:00
Scott Lahteine
8e05b0037b Merge pull request #3307 from thinkyhead/rc_host_keepalive_comment 
Fix comment about host keepalive interval
 2016-04-01 17:48:17 -07:00
Scott Lahteine
ffe054c129 Fix comment about host keepalive interval 2016-04-01 17:28:08 -07:00
Scott Lahteine
0d6609c3c5 lcd_goto_menu should set lcdDrawUpdate to 2 2016-04-01 17:07:40 -07:00
Scott Lahteine
af89ccf96a Use flag to defer lcd return-to-status 2016-04-01 17:07:39 -07:00
Scott Lahteine
641b30217e Patch prevEncoderPosition compile issue 
Thanks to @jbrazio #3301
 2016-04-01 17:07:39 -07:00
Scott Lahteine
41aa4bdf1f Use XYZ translated strings in dogm 2016-04-01 17:07:39 -07:00
Scott Lahteine
92882fcc51 Allow lcd_implementation_drawedit to draw a message 2016-04-01 17:04:33 -07:00
Scott Lahteine
0114cf1101 RCBugFix version string 2016-04-01 17:04:33 -07:00
Scott Lahteine
9c43369ebb Merge pull request #3306 from thinkyhead/rc_fix_num2str 
Clean up num2str functions, extend ftostr43
 2016-04-01 17:04:03 -07:00
Scott Lahteine
6791401ca7 Merge pull request #3305 from thinkyhead/rc_emart_patch_3297 
Support for MKS v1.3/1.4 and Sainsmart RAMPS 1.4 variants
 2016-04-01 17:03:54 -07:00
Scott Lahteine
1da9d10173 Support for MKS v1.3/1.4 and Sainsmart RAMPS 1.4 variants 2016-04-01 16:54:35 -07:00
Scott Lahteine
fcedfd6e99 Clean up num2str functions, extend ftostr43 2016-04-01 16:52:59 -07:00
Scott Lahteine
2512d8fd5e Merge pull request #3304 from thinkyhead/rc_slow_buttons 
Macros for buttons, some cleanup for slow buttons
 2016-04-01 15:31:54 -07:00
Scott Lahteine
f543aaa54e Apply standard pin test to buttons 
This is the easiest way to make button pin testing consistent without
renaming all the button pins. Just make a macro especially for testing
if button pins are set, since they are named consistently in the pins
files.
 2016-04-01 15:12:12 -07:00
Scott Lahteine
f2ffc8b28b Rename local slow_buttons for clarity 2016-04-01 15:06:33 -07:00
Scott Lahteine
26279fa43c Merge pull request #3289 from esenapaj/patch-1 
Update Kana font
 2016-04-01 14:31:32 -07:00
Scott Lahteine
0bee67e5f1 Merge pull request #3294 from jbrazio/bugfix/mandatory-extrude-mintemp 
Fix an error when EXTRUDE_MINTEMP is not defined
 2016-04-01 14:23:32 -07:00
João Brázio
709dd5aa4d Fix an error when EXTRUDE_MINTEMP is not defined 2016-03-31 16:25:48 +01:00
Scott Lahteine
4f85226106 Merge pull request #3288 from thinkyhead/rc_servo_plus_delta 
Fix servo deploy/stow issues with G29 and Delta
 2016-03-30 19:01:00 -07:00
Scott Lahteine
bc86ee0271 Simplify homeaxis with some macros 2016-03-30 18:44:05 -07:00
esenapaj
cc5059478a Update Kana font 2016-03-31 10:02:47 +09:00
Scott Lahteine
82ef101ed5 Deploy & Stow in G29 for Delta + Z Servo Endstop 2016-03-30 16:41:16 -07:00
Scott Lahteine
33a9d32800 Merge pull request #3285 from thinkyhead/rc_fix_drawedit 
Fix string issues in ultralcd.cpp
 2016-03-30 13:01:07 -07:00
Scott Lahteine
6a4d394fff Fix pointer-to-string issues with set_home_offsets and _lcd_level_bed_homing 2016-03-30 12:32:25 -07:00
Scott Lahteine
de333c4fea Merge pull request #3279 from thinkyhead/rc_filament_width_sensor 
FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR
 2016-03-30 12:16:27 -07:00
Scott Lahteine
0f835c0c4e Merge pull request #3259 from jbrazio/bugfix/old-ide-warning 
Show a warning message when Arduino IDE is prior to 1.5
 2016-03-30 12:15:51 -07:00
Scott Lahteine
8def2c31db Merge pull request #3284 from thinkyhead/rc_stop_watchheat_lcdset0 
Fix temperature checking conditions (backwards!)
 2016-03-30 12:10:39 -07:00
Scott Lahteine
b919a6f182 Merge pull request #3280 from esenapaj/patch-1 
Update U8glib URL
 2016-03-30 12:06:53 -07:00
Scott Lahteine
8bf5f7c676 Merge pull request #3282 from jbrazio/bugfix/m104-timer-wont-start 
M104 not starting the print timer
 2016-03-30 11:54:16 -07:00
Scott Lahteine
31450ad498 Fix temperature checking conditions (backwards!) 2016-03-30 11:52:03 -07:00
João Brázio
187c183c20 M104 was not starting the print timer 2016-03-30 11:33:24 +01:00
esenapaj
352294b5f5 Update U8glib URL 2016-03-30 14:26:28 +09:00
Scott Lahteine
507aef055f Patch broken M404 2016-03-29 20:54:31 -07:00
Scott Lahteine
1a79b13b7a FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR 2016-03-29 20:54:31 -07:00
Scott Lahteine
7f81aa7ff3 Pins should always be defined (even for disabled features) 2016-03-29 20:44:14 -07:00
Scott Lahteine
5f32184254 Merge pull request #3278 from thinkyhead/rc_cleanup_m111_redo 
Echo all debug levels in M111, default to DEBUG_NONE
 2016-03-29 20:34:31 -07:00
Scott Lahteine
05765fb570 Add DEBUGGING macro 2016-03-29 19:50:01 -07:00
Scott Lahteine
4402760739 Echo all debug levels in M111, default to DEBUG_NONE 
Redo of #3268 by @jbrazio
 2016-03-29 19:18:45 -07:00
Scott Lahteine
f0b96f5cae Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth 
Refinements, fixes, reduced stack usage in CardReader
 2016-03-29 18:30:18 -07:00
Scott Lahteine
12c0bf9521 Merge pull request #3277 from jbrazio/bugfix/m190-temp-never-reached 
M190 bed temp is never reached
 2016-03-29 18:28:51 -07:00
João Brázio
c6577aea60 M190 bed temp was never reached 2016-03-30 01:03:20 +01:00