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

6421 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
c0e7257932 Fix bug in new endstop pullups handling 2016-04-03 20:52:32 -07:00
João Brázio
f94900ee79 Added a script to check all language files for missing translations 2016-04-04 04:46:04 +01:00
Scott Lahteine
de39056f68 Merge pull request #3343 from thinkyhead/rc_fix_m111_output 
Fix M111 output using pgm_read_word, as required
 2016-04-03 17:44:38 -07:00
Scott Lahteine
e0bef7dfcc Merge pull request #3342 from esenapaj/patch-1 
Update Japanese translation
 2016-04-03 17:38:28 -07:00
Scott Lahteine
fd0ac371b0 Fix M111 output using pgm_read_word as required 
As noted by @taratata2016 in https://github.com/MarlinFirmware/Marlin/issues/3300#issuecomment-204687275
 2016-04-03 17:33:06 -07:00
esenapaj
c4d7e0307c Update Japanese translation 2016-04-04 09:11:23 +09:00
Scott Lahteine
c045ec8cb3 Merge pull request #3065 from thinkyhead/rc_doc_tweaks 
Simplified endstop configuration
 2016-04-03 17:05:47 -07:00
Scott Lahteine
d771174797 Merge pull request #3337 from esenapaj/patch-2 
suppress warnings
 2016-04-03 17:01:22 -07:00
Scott Lahteine
f2032cfcf6 Merge pull request #3341 from thinkyhead/rc_english_patch 
Fix English definition for MSG_LEVEL_BED_CANCEL
 2016-04-03 16:58:51 -07:00
Scott Lahteine
fa97ba6230 Merge pull request #3340 from thinkyhead/japanese_accent_sanitize 
Update Japanese translation
 2016-04-03 16:48:30 -07:00
Scott Lahteine
09c6f80c1e Fix MSG_LEVEL_BED_CANCEL english 2016-04-03 16:41:27 -07:00
esenapaj
afe7d26543 Update Japanese translation 2016-04-03 16:39:37 -07:00
Scott Lahteine
3aee89b93a Merge pull request #3338 from thinkyhead/rc_patches_april_3 
Add history to LCD Menus, fix up Manual Bed Leveling
 2016-04-03 16:37:39 -07:00
Scott Lahteine
22a43980e8 Merge pull request #3339 from thinkyhead/rc_has_temp_hotend 
Add HAS_TEMP_HOTEND, account for MAX31855 in conditionals
 2016-04-03 16:35:54 -07:00
Scott Lahteine
7a2f73c6db Remove extra comma from LCDHandlerAction 2016-04-03 16:27:30 -07:00
Scott Lahteine
3fbf67e5ce Patch MBL feedback and event handling 2016-04-03 16:27:30 -07:00
Scott Lahteine
ef2fbaec98 Headings for menu sub-items, actions, etc. 2016-04-03 16:27:29 -07:00
Scott Lahteine
dc109ac4e2 Move MBL code to its logical place 2016-04-03 16:27:29 -07:00
Scott Lahteine
6730408ec1 Move lcd_autostart_sd to its logical place 2016-04-03 16:27:29 -07:00
Scott Lahteine
056b80dc53 Have "back" menu items go to the previous item 2016-04-03 16:27:29 -07:00
Scott Lahteine
c94482168b Add MSG_LEVEL_BED_CANCEL for MBL 2016-04-03 16:27:29 -07:00
Scott Lahteine
877fb1f588 Account for MAX31855 in conditionals 2016-04-03 16:19:17 -07:00
Scott Lahteine
d24f14a799 Add HAS_TEMP_HOTEND define 2016-04-03 16:18:49 -07:00
esenapaj
f9e1a0ee6c suppress warnings 2016-04-04 06:48:53 +09:00
Scott Lahteine
cf9a171aa9 Merge pull request #3330 from thinkyhead/rc_mbl_lcdDrawUpdate 
Improvements to MBL, general LCD menu handling
 2016-04-02 19:20:23 -07:00
Scott Lahteine
783e0122d6 Merge pull request #3331 from thinkyhead/rc_default_info 
Split DEFAULT_MACHINE_NAME from DEFAULT_SOURCE_URL
 2016-04-02 19:11:48 -07:00
Scott Lahteine
2b01649533 Move default machine info to pins files 2016-04-02 18:53:05 -07:00
Scott Lahteine
4f24323817 Split DEFAULT_MACHINE_NAME from DEFAULT_SOURCE_URL 
Addressing #3325 – Avoid undefined symbol errors in the compiler.
 2016-04-02 18:41:01 -07:00
Scott Lahteine
771ee1c1a9 Update MBL menu sub-function names 2016-04-02 18:20:47 -07:00
Scott Lahteine
d659777e70 Fix MBL to handle re-entrant calls 2016-04-02 18:14:49 -07:00
Scott Lahteine
5719fcba51 Add MSG_LEVEL_BED_DONE and MSG_LEVEL_BED_WAITING 2016-04-02 18:14:49 -07:00
Scott Lahteine
80b8fd1cad Add MSG_HOME_OFFSETS_APPLIED 2016-04-02 18:14:49 -07:00
Scott Lahteine
d1c45ff80b More user interaction in MBL 2016-04-02 18:14:49 -07:00
Scott Lahteine
240b71ee1c Give names to lcdDrawUpdate values 2016-04-02 18:14:48 -07:00
Scott Lahteine
b0a3c7a91c Add feedback sounds to MBL items 2016-04-02 17:08:43 -07:00
Scott Lahteine
782c598e66 Use ftostr43 with '+' option in MBL Z adjuster 2016-04-02 17:08:43 -07:00
Scott Lahteine
f08b0d034f Merge pull request #3328 from RicardoGA/RC_Babystepping_fix 
Babystepping Fix
 2016-04-02 16:48:45 -07:00
Scott Lahteine
09437466b1 Merge pull request #3324 from tnw513/fix_filament_dia 
changed DEFAULT_NOMINAL_FILAMENT_DIA for consistency between example config files
 2016-04-02 16:40:24 -07:00
Scott Lahteine
2b4c42610c Adjust SanityCheck messages 2016-04-02 16:39:23 -07:00
Scott Lahteine
a617d12f70 Account for Z_DUAL_ENDSTOPS in sanity checking of endstops 2016-04-02 16:39:23 -07:00
Scott Lahteine
868eebfdee Simplify configuration of Z2 endstops 2016-04-02 16:39:23 -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
071c742b8a Move STRINGIFY to macros.h, use in language.h 2016-04-02 16:38:43 -07:00
Scott Lahteine
2ee599d873 Merge pull request #3321 from tnw513/fix_max_endstop 
Max endstops disabled for stock Prusa i3 Hephestos.
 2016-04-02 16:38:10 -07:00
Scott Lahteine
4e1bbdb89f Merge pull request #3320 from alhirzel/RCBugFix 
Fix manual Y movement on delta (regression).
 2016-04-02 16:37:14 -07:00
Scott Lahteine
5fb88a2754 Merge pull request #3314 from jbrazio/bugfix/followup-3235 
Fixes missing icons from status screen
 2016-04-02 16:36:18 -07:00
Scott Lahteine
3c14c01a3a Merge pull request #3310 from esenapaj/patch-2 
Follow-up the commit a393941
 2016-04-02 16:35:31 -07:00
Scott Lahteine
93f690afdb Merge pull request #3317 from jbrazio/bugfix/followup-3305 
Wrong board def in pins.h
 2016-04-02 16:34:39 -07:00
RicardoGA
6b1d2263a2 Babystepping Fix 2016-04-02 14:53:57 -06:00
Silvio Didonna
dfe891fe11 changed filament diameter for consistency between all example config files. 2016-04-02 21:05:25 +02:00