bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
4,836 Commits 1 Branch 4 Tags 151 MiB
388a58ec02
Commit Graph

3910 Commits

Author SHA1 Message Date
João Brázio
9a3f676709
Throw an error if ENCODER_PULSES_PER_STEP < -1 2016-04-14 16:20:17 +01:00
gralco
69c00aea4c Include bed hysteresis setting in the example configs 2016-04-14 08:03:38 -06:00
Scott Lahteine
9ce4264fda Merge pull request #3490 from thinkyhead/rc_mbl_adjustments 
Document some movement functions, rename a local
 2016-04-13 20:55:20 -07:00
Scott Lahteine
f8e10ff1d8 Merge pull request #3491 from thinkyhead/rc_mechanical_probe 
Support for "mechanical probe" with Allen Key as a special case
 2016-04-13 20:55:14 -07:00
Scott Lahteine
7eb476597f Update some comments in Configuration.h 2016-04-13 20:34:42 -07:00
esenapaj
2eb1b102f8 Support for "mechanical probe" with Allen Key as a special case 2016-04-13 20:34:12 -07:00
Scott Lahteine
cfcd3d7b3e Rename z_offset local to zoffset 2016-04-13 20:09:20 -07:00
Scott Lahteine
5fd20ecac3 Comments on some movement functions 2016-04-13 20:09:20 -07:00
Scott Lahteine
c1b953d38f Merge pull request #3487 from thinkyhead/rc_redo_esenpaj_3479 
Apply esenapaj 3479 and delta/scara position bugfix
 2016-04-13 18:11:33 -07:00
Scott Lahteine
a781a6f955 Apply esenapaj 3479 and delta/scara position bugfix 2016-04-13 17:41:20 -07:00
Scott Lahteine
2ae7394640 More fine-grained control of LCD redraw 2016-04-12 21:34:34 -07:00
Scott Lahteine
525d8256d4 Merge pull request #3481 from thinkyhead/rc_extruder_offset_array 
Fix: gcode_T using non-existent Z offset
 2016-04-12 18:23:08 -07:00
Scott Lahteine
b9301e6c62 Merge pull request #3482 from thinkyhead/rc_fix_HAS_Z_MIN_PROBE 
Patch conditions for HAS_Z_MIN_PROBE
 2016-04-12 18:23:02 -07:00
Scott Lahteine
dc0a3e37be Patch conditions for HAS_Z_MIN_PROBE 2016-04-12 18:11:36 -07:00
Scott Lahteine
46881c846c Add comments for extruder offset options 2016-04-12 17:16:58 -07:00
Scott Lahteine
edf376ce0d Fix: gcode_T using non-existent Z offset 
As noted by @snowzach in #3461
 2016-04-12 17:15:10 -07:00
gralco
178aeb79c8 Implementation of M190 bed temp hysteresis 2016-04-12 08:56:14 -06:00
Scott Lahteine
0439483bc8 Merge pull request #3476 from thinkyhead/rc_debug_leveling_gcode_t 
Add DEBUG_LEVELING output for gcode_T
 2016-04-11 21:03:15 -07:00
Scott Lahteine
c03e5f5efd Merge pull request #3475 from thinkyhead/rc_language_cleanup 
General cleanup of language files
 2016-04-11 20:50:57 -07:00
Scott Lahteine
910d3648bb Merge pull request #3474 from thinkyhead/rc_russian_apr2016 
Additional Russian translations
 2016-04-11 20:50:50 -07:00
Scott Lahteine
63d8893f5d Add DEBUG_LEVELING output for gcode_T 2016-04-11 20:45:10 -07:00
Scott Lahteine
081cfc5cf3 Merge pull request #3472 from thinkyhead/fix_issue_3375 
Initialize stepper counts for Delta/SCARA
 2016-04-11 19:59:12 -07:00
Scott Lahteine
fe0fe184aa Replace some tabs with spaces 2016-04-11 19:42:20 -07:00
Scott Lahteine
e773d081c0 General language file cleanup 2016-04-11 19:42:09 -07:00
Scott Lahteine
b63c79b5ff Merge pull request #3473 from thinkyhead/rc_one_more_elapse 
Fix a messed up ELAPSED instance
 2016-04-11 19:30:59 -07:00
Scott Lahteine
068bc980ce Additional Russian translations 
Thanks to @gans-AD – #3363
 2016-04-11 19:30:14 -07:00
Scott Lahteine
f840c7de4d Initialize stepper counts for Delta/SCARA 2016-04-11 19:02:35 -07:00
Scott Lahteine
c5a8755cc0 Fix a messed up ELAPSED instance 2016-04-11 18:48:27 -07:00
Scott Lahteine
81918657f4 Fix Deutsch string errors, redundancies 2016-04-11 18:12:32 -07:00
Scott Lahteine
56acaf3594 Merge pull request #3469 from thinkyhead/rc_aleph_cooldownfix 
Fix for M109 and M190 cooldown
 2016-04-11 18:01:01 -07:00
gralco
c218db136a Fix for M109 and M190 cooldown 
Also removes the re-definition of now inside M190's while loop
 2016-04-11 17:12:23 -07:00
Scott Lahteine
e2a197ab71 Merge pull request #3467 from AnHardt/Fix-Servo-without-endstop-probe 
Fix-Servo-without-endstop/probe
 2016-04-11 17:04:54 -07:00
Scott Lahteine
3a1ac14bbc Merge pull request #3437 from thinkyhead/rc_lcd_encoder_movement 
More bits when encoderPosition is cast as signed
 2016-04-11 17:03:23 -07:00
Scott Lahteine
c5a2ce4366 Merge pull request #3446 from thinkyhead/rc_fixup_M206_and_mesh 
Fix home_offset handling and account for it in G29
 2016-04-11 16:49:01 -07:00
Scott Lahteine
b1bb1c7989 Merge pull request #3466 from thinkyhead/rc_look_for_leveling_bug 
Add CORE support to st_set_position and plan_set_position
 2016-04-11 16:45:00 -07:00
AnHardt
9cc571b312 Fix-Servo-without-endstop-probe 
Sorry for not having realized someone (me) redefined not existing servo pinns to -1, some lines above.
This is a simple error - not a feature.
 2016-04-12 01:01:11 +02:00
Scott Lahteine
3e5312f116 CORE support for st_set_position & plan_set_position 2016-04-11 15:13:42 -07:00
Scott Lahteine
e087a99a10 Some cleanup of st_get_pos functions 2016-04-11 15:13:42 -07:00
João Brázio
ca6c6ec4ca
Versions of Arduino IDE prior to 1.6.0 are no longer supported 2016-04-11 19:03:06 +01:00
Scott Lahteine
fdee2be49c More logging of matrix behavior 2016-04-11 00:06:33 -07:00
Scott Lahteine
7f265db3ef Move sync_plan_position after DEBUG_LEVELING 2016-04-10 23:40:11 -07:00
Scott Lahteine
02550af7c3 Merge pull request #3453 from thinkyhead/rc_jbrazio_m190 
ELAPSED / PENDING for rollover-safe time checking
 2016-04-10 20:25:02 -07:00
Scott Lahteine
7c770f039c Merge pull request #3456 from thinkyhead/rc_MSG_ERR_REDUNDANT_TEMP 
Remove redundant text from MSG_ERR_REDUNDANT_TEMP
 2016-04-10 20:23:55 -07:00
Scott Lahteine
925cc305ce Merge pull request #3455 from michos-conradt/RCBugFix 
Add missing translations for German
 2016-04-10 19:18:42 -07:00
Scott Lahteine
011f4736f1 Remove redundant text from MSG_ERR_REDUNDANT_TEMP 2016-04-10 19:14:46 -07:00
Scott Lahteine
906c1c066f Merge pull request #3423 from jbrazio/translate/pt_BR 
Added missing pt_BR translation
 2016-04-10 19:13:52 -07:00
Scott Lahteine
803845ec18 Add a case for M113 to process_next_command 2016-04-10 18:53:03 -07:00
Michael Conradt
f3a7a5c99b Merge branch 'RCBugFix' into translations 2016-04-11 03:50:23 +02:00
Michael Conradt
8b923039e2 Add missing german translations. 2016-04-11 03:20:21 +02:00
Scott Lahteine
386140f361 Test time difference in safe way 2016-04-10 18:09:31 -07:00
Scott Lahteine
1b7356b3a1 Account for home_offset in G29 handler 2016-04-10 15:35:02 -07:00
Scott Lahteine
f3562dd895 Have M206 alter current_position, M428 use new function 2016-04-10 15:35:01 -07:00
Scott Lahteine
562e281c73 Merge pull request #3443 from thinkyhead/rc_host_timeout_tweak 
Adjust timeout code in host_keepalive
 2016-04-09 17:45:36 -07:00
Scott Lahteine
6d465321b5 Adjust timeout code in host_keepalive 2016-04-09 16:58:17 -07:00
Scott Lahteine
8198cc30b5 More bits when encoderPosition is cast as signed 2016-04-09 14:22:12 -07:00
Michael Neumann
95acba2cfa Wrong Pin Assignment Megatronics 3 
SERVO2 is doubled defined and causes compiler errors
 2016-04-09 11:23:22 +02:00
Scott Lahteine
50c3140040 Merge pull request #3414 from thinkyhead/rc_host_timeout_mods 
Host Keepalive configurable timeout with 2s default
 2016-04-08 21:45:45 -07:00
Scott Lahteine
6bd20371f0 Merge pull request #3438 from thinkyhead/rc_M109_residency_loop_fix 
Fix bug which can cause an infinite M109 loop
 2016-04-08 21:36:30 -07:00
Scott Lahteine
96e37bb70a Merge pull request #3419 from DavidBjerreBjoerklund/patch-2 
Update language_da.h
 2016-04-08 21:35:58 -07:00
Scott Lahteine
13d758c651 Merge pull request #3420 from DavidBjerreBjoerklund/patch-3 
Update language_da.h
 2016-04-08 21:31:14 -07:00
Scott Lahteine
518068a5a8 Merge pull request #3425 from tnw513/FixLangIt 
Optimized Italian strings to fit in 16 character display
 2016-04-08 21:29:28 -07:00
Scott Lahteine
1b81e5adc7 Merge pull request #3431 from AnHardt/lang-de 
de-language additions
 2016-04-08 21:25:00 -07:00
Scott Lahteine
1acf901b63 Adjustments to residency_start_ms handling 2016-04-08 21:20:23 -07:00
gralco
907aed57db Fix bug which can cause an infinite M109 loop 
Since residency_start_ms is -1 when entering the heatup while loop whilst the hotend temp is close to the target them already then it may not escape.

Hence "Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time."
 2016-04-08 21:20:23 -07:00
jbrazio
dd3a06a95a Implemented M155 and M156, a generic TWI/I2C interface for Marlin 2016-04-08 20:14:37 -07:00
Scott Lahteine
843aa90b5a Merge pull request #3434 from thinkyhead/rc_more_debug_leveling 
Additional debug leveling output
 2016-04-08 18:57:18 -07:00
Scott Lahteine
a644ab1de4 Minor patch ups to G29 
This may fix a subtle bug caused by doing `G29` more than once without
`G28` between.
 2016-04-08 17:53:15 -07:00
Scott Lahteine
cba2698871 Additional DEBUG_LEVELING output 2016-04-08 17:53:15 -07:00
AnHardt
c3d1b7db2d de-language additions 2016-04-08 22:51:04 +02:00
Scott Lahteine
4e17187c96 Merge pull request #3426 from thinkyhead/rc_no_unhomed_lcd_move_on_delta_scara 
No LCD Move for unhomed Delta/SCARA
 2016-04-07 19:29:45 -07:00
Scott Lahteine
5e18d650c4 Merge pull request #3427 from thinkyhead/rc_better_SERIAL_ECHOPAIR 
No casting needed for SERIAL_ECHOPAIR
 2016-04-07 19:29:18 -07:00
Scott Lahteine
e0b0d1eb6b Add M113 to get/set Host Keepalive 2016-04-07 19:25:56 -07:00
Scott Lahteine
85883da90c Implement basic HOST_KEEPALIVE_INTERVAL 2016-04-07 19:25:56 -07:00
Scott Lahteine
2eca8d63b3 Add DEFAULT_KEEPALIVE_INTERVAL setting 2016-04-07 19:25:56 -07:00
Scott Lahteine
098fb8f8c9 Merge pull request #3413 from thinkyhead/rc_probe_G30_position 
Report the probe position in G30
 2016-04-07 19:25:33 -07:00
Scott Lahteine
3460d01441 Merge pull request #3422 from jbrazio/translate/pt_PT 
Update pt_PT translation
 2016-04-07 19:18:56 -07:00
Scott Lahteine
c9c7c66b95 Merge pull request #3421 from jbrazio/bugfix/m109-EXTRUDE_MINTEMP-expansion 
M109: Protect against EXTRUDE_MINTEMP expansion
 2016-04-07 19:18:34 -07:00
Scott Lahteine
d7cbb2eec9 Merge pull request #3403 from jbrazio/feature/stopwatch 
Print job timer rework
 2016-04-07 19:18:03 -07:00
Scott Lahteine
f834bcd43a Merge pull request #3415 from thinkyhead/rc_filwidth_issue 
Fix FILAMENT_WIDTH_SENSOR measurement
 2016-04-07 19:08:42 -07:00
Scott Lahteine
5fc6daba2b Disallow REPRAPWORLD_KEYPAD moves on Delta/SCARA until homed 2016-04-07 18:40:54 -07:00
Scott Lahteine
7bb15a1c57 Consolidate REPRAPWORLD_KEYPAD definitions 2016-04-07 18:40:54 -07:00
Scott Lahteine
dc19b69697 No casting needed for SERIAL_ECHOPAIR 2016-04-07 16:33:21 -07:00
Scott Lahteine
165e73794a Tweak encoderPosition non-zero test 2016-04-07 16:09:42 -07:00
Scott Lahteine
479d307a44 Disable LCD Move XYZ for unhomed Delta/SCARA 2016-04-07 16:09:42 -07:00
Silvio Didonna
9088802da1 Optimized Italian strings to fit in 16 character display 2016-04-07 19:18:22 +02:00
João Brázio
801cd48a72
Added missing pt_BR translation 2016-04-07 13:07:57 +01:00
João Brázio
013f19054b
Update pt_PT translation 2016-04-07 13:00:08 +01:00
João Brázio
471d30cc1c
M109: Protected against EXTRUDE_MINTEMP expansion 2016-04-07 12:50:57 +01:00
DavidBjerreBjoerklund
5f840d2e30 Update language_da.h 
Corrected:
MSG_KILLED
MSG_NO_MOVE
MSG_STOPPED
MSG_PRINT_ABORTED
MSG_ON
MSG_OFF
 2016-04-07 13:42:27 +02:00
João Brázio
7c7e30f4cc
Adherence to the new OOP coding standards 2016-04-07 12:41:09 +01:00
DavidBjerreBjoerklund
b80b40a578 Update language_da.h 
Added translation mentioned in issue #3351:
Homing would be best tranlated homing, or "Kører til udgangsposition".

#define MSG_SET_HOME_OFFSETS
#define MSG_LEVEL_BED_HOMING
#define MSG_LEVEL_BED_WAITING 
#define MSG_LEVEL_BED_DONE
#define MSG_LEVEL_BED_CANCEL 
#define MSG_HOME_OFFSETS_APPLIED
 2016-04-07 12:52:31 +02:00
Scott Lahteine
573d772c92 Merge pull request #3416 from paulusjacobus/RCBugFix 
Optimised Ducth messages to fit in 16 Char display Update language_nl.h
 2016-04-06 20:41:14 -07:00
paulusjacobus
3f7ae9a7ce Update language_nl.h 
Optimised all added messages to fit within 16 Characters
 2016-04-07 13:15:00 +10:00
Scott Lahteine
865dcf3fb4 Fix FILAMENT_WIDTH_SENSOR measurement 
Only measure and store filament width when E is going forward.
 2016-04-06 19:48:04 -07:00
Scott Lahteine
2f6c5fe2da Report the probe position in G30 2016-04-06 16:55:21 -07:00
Scott Lahteine
74effedbf5 Merge pull request #3412 from paulusjacobus/RCBugFix 
rebased my fork with RCBugFix release in order to push language_nl.h
 2016-04-06 16:53:35 -07:00
Scott Lahteine
bba1f16589 Merge pull request #3411 from esenapaj/patch-1 
Update Readme.fonts about Kana
 2016-04-06 16:19:19 -07:00
Paul de Groot
48a4410f02 rebased my fork with RCBugFix release in order to push language_nl.h 2016-04-07 08:17:59 +10:00
esenapaj
ff9511b870 Update Readme.fonts about Kana 
I think that that sentence has been completed its part. 
Because Kana fonts were revised by me the other day(PR #3289), who am a native Japanese.

And for @AnHardt,
I'd like to take this opportunity to express one's heartfelt gratitude as a far eastern person,
about you has been maintaining the resource of Japanese despite you are a far western person.
 2016-04-07 07:13:46 +09:00
Silvio Didonna
e215c7100d fixed mistranslations and minor changes for consistency between "it" and "en" files. 2016-04-06 16:45:04 +02:00
Silvio Didonna
6208db3b00 fixed mistranslations and minor changes for consistency between "it" and "en" files. 2016-04-06 16:40:01 +02:00
João Brázio
e48d0263bf Bugfix: M32 was still using the old print timer 2016-04-06 04:41:36 +01:00
João Brázio
e8b80d8c20 Implemented M75, M76, M77 to control the print timer 2016-04-06 04:38:42 +01:00
João Brázio
eb61051556 Rework the print job timer to use the stopwatch class 2016-04-06 04:34:03 +01:00
João Brázio
399101fff3 Implemented the stopwatch class and methods 2016-04-06 04:23:45 +01:00
Scott Lahteine
98f2e9fc83 Reduce string storage required for DEBUG_LEVELING 2016-04-05 19:04:42 -07:00
Scott Lahteine
1af5d7b35f Add more leveling-debug output 2016-04-05 18:31:10 -07:00
Scott Lahteine
d5b19a49f6 Merge pull request #3384 from thinkyhead/rc_adjust_M111_output 
Final tweaks to M111 output
 2016-04-05 16:48:59 -07:00
Scott Lahteine
da2ff4a6d3 Catch a TEMP_SENSOR error before a pins issue 2016-04-05 16:17:28 -07:00
Scott Lahteine
90f6f02aca Merge pull request #3397 from thinkyhead/rc_menu_issues_fixer 
Revert #3388, clean up lcd_move code
 2016-04-05 15:45:35 -07:00
Scott Lahteine
fb38d698db Add feedback after "Click to Begin" 2016-04-05 15:35:05 -07:00
Scott Lahteine
d5f0db26dc Merge pull request #3390 from jbrazio/docs/update-source-url 
Update DEFAULT_SOURCE_URL comment
 2016-04-05 15:17:07 -07:00
Scott Lahteine
ce58d1d4d5 Merge pull request #3392 from barus93/patch-2 
Update language_it.h
 2016-04-05 15:16:24 -07:00
Scott Lahteine
582b58e660 Add audio feedback to edit items 2016-04-05 14:51:11 -07:00
Scott Lahteine
a70c3ffc21 Minor syntax tweak with encoderPosition 2016-04-05 14:51:11 -07:00
Scott Lahteine
0f247187b8 Drop extra setting of currentMenu 2016-04-05 14:51:11 -07:00
Scott Lahteine
24cde86a4f Fix syntax highlighting of menu_edit_type lines 2016-04-05 14:51:11 -07:00
Scott Lahteine
86372cd394 Add underscore to internal lcd move function names 2016-04-05 14:51:11 -07:00
Scott Lahteine
aa97328cd3 Use min_pos/max_pos for _lcd_move 2016-04-05 14:51:10 -07:00
Scott Lahteine
f936df9507 Small cleanup of feedrate dead-zone 2016-04-05 14:51:10 -07:00
Scott Lahteine
f5c2fb27cd Handle defer_return_to_status in lcd_goto_menu 2016-04-05 14:51:10 -07:00
Scott Lahteine
8459f7fa5c Use ms where possible. 2016-04-05 14:51:10 -07:00
Scott Lahteine
34ce9c4c1c Restore save previous for menu edit items 2016-04-05 14:26:36 -07:00
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
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
Scott Lahteine
ce0a9d3dc6 A picky fix of indentation in cardreader.cpp 2016-03-29 16:23:12 -07:00
Scott Lahteine
4ed8351e3d Revert use of enqueue_and_echo_command_now 2016-03-29 16:23:12 -07:00
Scott Lahteine
70d1d4de5f Small code spacing adjustments 2016-03-29 03:19:27 -07:00
Scott Lahteine
0385acea7a Fix workDirParents -> getAbsFilename relationship 2016-03-29 03:18:53 -07:00
Scott Lahteine
27d70599d4 Change openFile default to "not-push" instead of "do-replace" 2016-03-29 03:16:35 -07:00
Scott Lahteine
372f93cc7a Rename "filenames" to "proc_filenames" 2016-03-29 03:15:01 -07:00
Scott Lahteine
6b01cf07c2 Use only as much stack as needed for the M23 command 2016-03-29 02:34:33 -07:00
Scott Lahteine
9e520ae319 Merge pull request #3272 from thinkyhead/rc_filament_sensor_scope 
Minor cleanup to filament sensor code
 2016-03-28 20:51:46 -07:00
Scott Lahteine
3252df7998 Minor cleanup to filament sensor code 2016-03-28 20:04:34 -07:00
Scott Lahteine
b60ea95adf Keep blinking limited to LCD_UPDATE_INTERVAL 2016-03-28 19:41:13 -07:00
Scott Lahteine
e0ab06cfae Merge pull request #3267 from thinkyhead/rc_command_args_null_oooops 
Cleanup, simplification of command dispatcher code
 2016-03-28 18:54:00 -07:00
Scott Lahteine
0b8ef5eba6 Split get_command into units, rename to get_available_commands 2016-03-28 06:00:04 -07:00
Scott Lahteine
545f7997ea Continue on empty lines instead of returning 2016-03-28 05:37:36 -07:00
Scott Lahteine
3dcf6d42ff Don't store escaped serial characters if comment_mode 2016-03-28 05:37:36 -07:00
Scott Lahteine
5f8e52aefb Minor cleanup to command dispatcher 2016-03-28 05:37:36 -07:00
jbrazio
0880fecbd4 Show a warning message when Arduino IDE is prior to 1.5 2016-03-28 11:55:42 +01:00
Scott Lahteine
f1ed310322 Add NUMERIC compare macros to simplify code 2016-03-28 03:52:49 -07:00
Scott Lahteine
3b2d159abd Relax the test for "Heating failed" errors 2016-03-27 07:02:10 -07:00
Scott Lahteine
2e4ddd5c22 Merge pull request #3260 from jbrazio/cleanup/standardize-comment-style 
Formatted multi-line comments
 2016-03-26 21:42:33 -07:00
jbrazio
443e6d26fe Formatted multi-line comments 2016-03-27 04:36:36 +01:00
esenapaj
7950b5268a Use SBI macro 2016-03-26 20:17:52 +09:00
Scott Lahteine
e4039a9b5b Merge pull request #3250 from esenapaj/patch-1 
Fix typo
 2016-03-26 00:41:31 -07:00
Scott Lahteine
1d987cd280 Merge pull request #3253 from thinkyhead/rc_autotune_menu_optional 
Make the Autotune option(s) in the LCD menu optional
 2016-03-26 00:32:05 -07:00
Scott Lahteine
d6f92f9efe Remove Tonokip remnant from recent PR 2016-03-25 23:50:29 -07:00
Scott Lahteine
ab412a2153 PIDTEMPBED on #endif 2016-03-25 23:50:28 -07:00
Scott Lahteine
53cc6cca46 Formalize some dependencies on PIDTEMPBED 2016-03-25 23:50:28 -07:00
Scott Lahteine
5955a3063f Sanity check PIDTEMPBED plus BED_LIMIT_SWITCHING 2016-03-25 23:50:28 -07:00
Scott Lahteine
67fabb6044 Merge pull request #3252 from thinkyhead/rc_keepalive_less 
Host Keepalive: Reduce frequency of "busy" messages
 2016-03-25 23:37:02 -07:00
Scott Lahteine
d1bdd25b84 Merge pull request #3249 from esenapaj/patch-2 
Update Japanese translation
 2016-03-25 22:53:00 -07:00
Scott Lahteine
0d554c10ac Merge pull request #3244 from ch100/RCBugFix 
Fixed backlight for PCF8575.
 2016-03-25 22:50:20 -07:00
Scott Lahteine
cd4c3e90bc Send a busy signal every 10 seconds instead of every 2 2016-03-25 22:15:40 -07:00
Scott Lahteine
8cb04816b5 Apply PID_AUTOTUNE_MENU option to ultralcd.cpp 2016-03-25 19:31:56 -07:00
Scott Lahteine
4b31c67dce Add PID_AUTOTUNE_MENU option 2016-03-25 19:31:56 -07:00
Scott Lahteine
e08915a723 Fix comments in Configuration_adv.h 2016-03-25 19:31:31 -07:00
Scott Lahteine
26168676e7 Merge pull request #3246 from thinkyhead/rc_fix_numeric_filenames 
Fix: current_command_args skips digits at the front
 2016-03-25 16:38:36 -07:00
esenapaj
f54315c728 Fix typo 
These are salvaged from closed-PR #3216.
 2016-03-26 08:37:17 +09:00
esenapaj
37a0806420 Update Japanese trasration 
Follow the PR #3242.
 2016-03-26 08:21:17 +09:00
Scott Lahteine
f423716c6a Fix: current_command_args skips digits at the front 
Closes #3245
 2016-03-25 16:12:41 -07:00
Christian Inci
627f39e1e3 Fixed backlight for PCF8575. 
Fixed backlight for PCF8575.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2016-03-25 14:49:55 +01:00
Scott Lahteine
fc0baec991 Merge pull request #3240 from esenapaj/patch-1 
Fix distribution date
 2016-03-25 06:49:42 -07:00
Scott Lahteine
18de9f55ac Merge pull request #3242 from thinkyhead/rc_epatel_mesh_fixes 
Updated Mesh Bed Leveling
 2016-03-25 06:48:12 -07:00
Scott Lahteine
3a1e6b1752 Merge pull request #3243 from AnHardt/homed 
axis_known_position -> axis_homed
 2016-03-25 06:36:46 -07:00
AnHardt
94962ee678 axis_known_position -> axis_homed 
In all these cases we want the axis to be homed. If we could have lost
some steps is secondary.

Reenables homing seperate axis with DISABLE_X / DISABLE_Y true.
 2016-03-25 14:05:20 +01:00
Edward Patel
14afe1a017 Move to Z=0 for G28 when using Manual Bed Leveling 
copy of 406992f9dd
 2016-03-25 04:58:44 -07:00
Edward Patel
c606ed447a Add "G29 S4" to fine tune Z level for Mesh Bed Leveling. 
Also add mbl.z_offset to the EEPROM, bumping the version to V23.
 2016-03-25 04:58:43 -07:00
Scott Lahteine
5d8036e554 Code cleanup around MOTOR_CURRENT_PWM options 2016-03-25 04:23:46 -07:00
esenapaj
bec112de87 Fix distribution date 2016-03-25 18:56:16 +09:00
Scott Lahteine
f394c0639e Merge pull request #3230 from jbrazio/bugfix/ultra-lcd-warning 
Fix a compiler warning in ultralcd.cpp
 2016-03-25 01:14:54 -07:00
João Brázio
f077c7abbf Fix dogm lcd error when FAN_PIN is defined as -1 2016-03-25 01:09:09 -07:00
Scott Lahteine
0da744b7b0 Further cleanup of comments, partial Doxygen-style 
Following up on #3231
 2016-03-25 00:45:56 -07:00
Scott Lahteine
4823791eb0 Merge pull request #3228 from esenapaj/patch-1 
Fix spelling
 2016-03-25 00:40:51 -07:00
jbrazio
80f221ed11 Fixed: warning: extra tokens at end of #endif directive 2016-03-24 19:33:25 +00:00
jbrazio
5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
esenapaj
89a845659a Fix spelling 
PROBABLE ->PROBEABLE
This is follow-up to #3069?
 2016-03-25 02:13:37 +09:00
Scott Lahteine
a6e39c1005 Release 1.1.0-RC4 2016-03-24 05:32:33 -07:00
Scott Lahteine
42ec1f39e7 Merge pull request #3207 from jbrazio/bugfix/toshiba-sdhc-flashair 
Toshiba Flash Air Wifi SD card support
 2016-03-24 05:28:48 -07:00
Scott Lahteine
b6ca86b974 Merge pull request #3197 from PheiPheiPhei/RCBugFix 
Enabling servo usage on boards with PWM current control
 2016-03-24 05:27:57 -07:00