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

3586 commits

Author SHA1 Message Date
Gege2B 03d5c9a482 Merge remote-tracking branch 'upstream/RCBugFix' into RCBugFix 2016-04-05 12:14:15 +02:00
Gege2B 4ea45d5c56 Some omitted french translation 2016-04-05 12:04:29 +02:00
barus93 f43e37bb0c Update language_it.h 
New messages translated:
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
#define MSG_LEVEL_BED_WAITING "Click to Begin"
#define MSG_LEVEL_BED_DONE "Leveling Done!"
#define MSG_LEVEL_BED_CANCEL "Cancel"
. . .
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
 2016-04-05 07:24:07 +02:00
João Brázio 9240682630 Followup #3326: Update DEFAULT_SOURCE_URL comment 2016-04-05 02:21:23 +01:00
Scott Lahteine 4b8a71055e Merge pull request #3388 from thinkyhead/rc_fix_move_menu_bug 
Fix: menu edit items saving position twice
 2016-04-04 17:05:15 -07:00
Scott Lahteine 1220dfd5d6 Fix: menu edit items saving position twice 2016-04-04 16:36:04 -07:00
Scott Lahteine b5920837ea Merge pull request #3370 from esenapaj/patch-1 
Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags
 2016-04-04 16:12:50 -07:00
Scott Lahteine 53b397ab14 Merge pull request #3364 from jbrazio/script/find-missing-translations 
Added a script to check all language files for missing translations
 2016-04-04 16:10:36 -07:00
Scott Lahteine d6fe454a13 Merge pull request #3386 from thinkyhead/rc_spanish_rebase 
Add Missing Spanish translation
 2016-04-04 16:07:34 -07:00
Scott Lahteine 2abea41c41 Merge pull request #3385 from thinkyhead/rc_dutch_translation 
Update language_nl.h
 2016-04-04 16:02:11 -07:00
RicardoGA 1bfaf57ee5 Add Missing Spanish translation 
Add the missing translation (Spanish) issue #3353
 2016-04-04 15:55:59 -07:00
paulusjacobus 4a4b797dca Update language_nl.h 
Added these messages with Dutch translation
#define MSG_BED_Z
#define MSG_A_TRAVEL
#define MSG_HEATING_FAILED_LCD
#define MSG_ERR_REDUNDANT_TEMP
#define MSG_THERMAL_RUNAWAY
#define MSG_ERR_MAXTEMP
#define MSG_ERR_MINTEMP
#define MSG_ERR_MAXTEMP_BED
#define MSG_ERR_MINTEMP_BED
#define MSG_HEATING
#define MSG_HEATING_COMPLETE
#define MSG_BED_HEATING
#define MSG_BED_DONE
 2016-04-04 15:46:50 -07:00
Scott Lahteine 1ee903f30d Merge pull request #3376 from gege2b/RCBugFix 
French translation
 2016-04-04 15:40:00 -07:00
Scott Lahteine c5ff2c7d32 Merge pull request #3377 from clexpert/patch-1 
Update language_cz.h
 2016-04-04 15:39:44 -07:00
Scott Lahteine 99898ea652 Merge pull request #3379 from barus93/patch-2 
Update language_it.h
 2016-04-04 15:39:15 -07:00
Scott Lahteine 56e8e2b0eb Final tweaks to M111 output 2016-04-04 15:36:07 -07:00
barus93 040a0c49db Update language_it.h 
ADD missing translation
 2016-04-04 20:22:34 +02:00
Petr Zahradnik 8b843e997a Update language_cz.h 2016-04-04 17:26:19 +02:00
Petr Zahradnik 3cd2beb750 Update language_cz.h 2016-04-04 16:54:26 +02:00
Gege2B 34bf9530c0 French translation 2016-04-04 16:45:06 +02:00
João Brázio d819a4aff9 Fixes #3346, followup #3343: variables must defined with the static keyword to work with PROGMEM when defined inside functions 2016-04-04 15:02:18 +01:00
esenapaj 1326dc7258 Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags 
This is follow-up the commit e5771346a4.
Update unnoticed files.
 2016-04-04 17:49:25 +09:00
Scott Lahteine 0433df3835 Merge pull request #3366 from jbrazio/translate/pt_PT 
Added missing translations for pt_PT
 2016-04-03 21:02:13 -07:00
João Brázio dff6adfbca Fixes #3361: Added missing translations for pt_PT 2016-04-04 04:57:32 +01:00
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 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 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 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 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
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
Alexander Hirzel 6e0d627c8c Unbreak the Delta radius clipping 2016-04-02 12:58:39 -04:00
Silvio Didonna 6c528e63eb max endstops disabled. Stock Prusa i3 Hephestos have min endstops. 2016-04-02 16:54:59 +02:00
Alexander Hirzel 949172606f Fix manual Y movement on delta (regression). 2016-04-02 10:48:13 -04:00
João Brázio 55a248d6b4 Fixes #3313 : Wrong board def in pins.h 2016-04-02 09:28:58 +01:00
João Brázio 04b2abb6aa Fixes #3312: Missing all icons from status screen 2016-04-02 06:50:02 +01:00
esenapaj 81593cb3cb Follow-up the commit a393941 2016-04-02 11:23:33 +09: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 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 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 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