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

4382 commits

Author SHA1 Message Date
Scott Lahteine
064efb20e0 Also call clear_command_queue for lcd_sdcard_stop 2016-06-02 17:16:19 -07:00
Scott Lahteine
6277395e1e set_current_position_from_planner() after stepper.quick_stop() 2016-06-02 17:16:19 -07:00
Scott Lahteine
381bc6f0b0 set_position => set_position_mm 2016-06-02 17:16:19 -07:00
Scott Lahteine
663d2463dc Merge pull request #3922 from thinkyhead/rc_statics_stepper 
Apply static to Stepper class
 2016-06-02 17:14:24 -07:00
Scott Lahteine
194185539d Merge pull request #3925 from thinkyhead/rc_statics_planner 
Apply static to Planner class
 2016-06-02 17:14:04 -07:00
Scott Lahteine
3fd9b331f0 Merge pull request #3924 from thinkyhead/rc_statics_temperature 
Apply static to Temperature class
 2016-06-02 17:13:17 -07:00
Scott Lahteine
db0fd021d0 Z raise options independent of ABL so G28 can use them 2016-06-02 16:56:49 -07:00
Scott Lahteine
9eecb4404b Make raise_z_after_probing null sometimes 2016-06-02 16:56:49 -07:00
Scott Lahteine
28fb1f8994 Tweak #endif comment for ABL GRID 2016-06-02 16:56:49 -07:00
Scott Lahteine
b3a37b493d Patch G28 servo stow to use Conditionals, raise_z_after_probing 2016-06-02 16:56:49 -07:00
Scott Lahteine
5390c846a5 Positive conditions for HAS_LCD_CONTRAST 2016-06-02 16:17:34 -07:00
Scott Lahteine
efa7209acf Improved LCD contrast handling 
Based on MarlinFirmware/MarlinDev#200 from @eboston
 2016-06-02 16:17:34 -07:00
Scott Lahteine
b703fa9538 Add sanity check for SAV_3DGLCD display types 2016-06-02 15:21:17 -07:00
lrpirlet
3aefa04386 Raise the servo probe before stow outside ABL context 2016-06-01 21:53:45 +02:00
Scott Lahteine
9729e9c450 Combine ST7565 / U8GLIB_NHD_C12864 items in dogm 2016-06-01 01:42:14 -07:00
Scott Lahteine
f331763eca Merge pull request #3829 from thinkyhead/rc_fix_T_command 
Fix bad movement in gcode_T when switching extruders
 2016-05-31 19:36:18 -07:00
Scott Lahteine
67f816ff79 Merge pull request #3926 from thinkyhead/rc_statics_endstops 
Drop FORCE_INLINE from endstops.h
 2016-05-31 19:35:41 -07:00
Scott Lahteine
2bd4f33369 Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup 
Remove excess allen key probe examples from configs
 2016-05-31 19:18:21 -07:00
Scott Lahteine
d698c89971 Fix bad movement in gcode_T when switching 2016-05-31 19:14:33 -07:00
Scott Lahteine
1a01a44a94 Merge pull request #3936 from thinkyhead/rc_sav_mk1 
Support for SAV_3DGLCD OLED LCD controller
 2016-05-31 18:46:25 -07:00
Scott Lahteine
4770d7c346 Merge pull request #3933 from boelle/patch-2 
added defines present in en but not in da
 2016-05-31 18:42:38 -07:00
Scott Lahteine
c6c01eaaac Merge pull request #3888 from thinkyhead/rc_slower_max31855 
Slower SPI speed for MAX31855
 2016-05-31 18:40:38 -07:00
Scott Lahteine
a0b000d752 Support for SAV_3DGLCD OLED LCD controller 2016-05-31 14:41:16 -07:00
Scott Lahteine
bd97bbc52a Make HAS_LCD_CONTRAST a boolean flag 2016-05-31 11:47:02 -07:00
Scott Lahteine
bc77670673 Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac 
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
 2016-05-31 10:29:37 -07:00
Bo Herrmannsen
a1a8240606 added defines present in en but not in da 2016-05-31 14:57:52 +02:00
Bo Herrmannsen
5eb7a79d93 initial changes to DA 2016-05-31 14:24:33 +02:00
Scott Lahteine
55ef04a566 Need to call dac_init() in setup() for DAC_STEPPER_CURRENT 
As reported by https://github.com/MarlinFirmware/Marlin/pull/3182#issuecomment-222595488
 2016-05-30 23:35:06 -07:00
Scott Lahteine
43a71ef226 Remove excess allen key probe examples from configs 2016-05-30 18:26:53 -07:00
Scott Lahteine
1582ed43bf Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv 
MBL: Move border macros to Configuration_adv.h
 2016-05-30 18:15:50 -07:00
Scott Lahteine
ff53819856 Drop FORCE_INLINE in planner.h 
This change actually does increase the binary size by about 12 bytes,
but how does it affect performance?
 2016-05-30 17:18:28 -07:00
Scott Lahteine
e60224a943 Drop FORCE_INLINE from endstops.h 
`FORCE_INLINE` seems to have no effect with standard optimization.
 2016-05-30 17:08:56 -07:00
Scott Lahteine
85512e9372 Drop FORCE_INLINE from temperature.h 
`FORCE_INLINE` seems to have no effect on code generation with standard
optimization.
 2016-05-30 17:06:50 -07:00
Scott Lahteine
78fb02a5ad Apply static to Temperature class 2016-05-30 16:50:51 -07:00
Scott Lahteine
c3df293fc6 Merge pull request #3923 from thinkyhead/rc_statics_endstops 
Apply static to Endstops class
 2016-05-30 16:48:23 -07:00
Scott Lahteine
02735fd500 Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak 
Tiny calc_timer speedup
 2016-05-30 16:47:03 -07:00
Scott Lahteine
668d50f68e Keep Stepper encapsulation, use static data and methods 2016-05-30 16:24:04 -07:00
Scott Lahteine
26f866b908 Apply static to Endstops class 2016-05-30 16:23:43 -07:00
Scott Lahteine
470d5ac09f Apply static to Planner class 2016-05-30 16:22:41 -07:00
Scott Lahteine
ecfdcf7250 Tiny calc_timer speedup 2016-05-30 16:17:02 -07:00
Edward Patel
06593833ff MBL: Move border macros to Configuration_adv.h 2016-05-30 20:50:16 +02:00
Scott Lahteine
ffe55c230d Merge pull request #3914 from thinkyhead/rc_fix_lcd_contrast 
Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
 2016-05-30 11:20:14 -07:00
Scott Lahteine
d3efc96289 Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL 
- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD`
- `MINIPANEL` conditionals are identical to `MAKRPANEL`
 2016-05-30 01:10:47 -07:00
Edward Patel
92a27c37b3 MBL: Apply https://github.com/MarlinFirmware/Marlin/pull/3903 to example_configurations 2016-05-30 09:50:11 +02:00
Scott Lahteine
3861f1e0da Merge pull request #3908 from jbrazio/bugfix/3826 
Closes #3826: SD printing will now pause and stop the print counter
 2016-05-30 00:08:57 -07:00
Scott Lahteine
8806c7bbcc Merge pull request #3903 from epatel/marlin/mbl_negative_xy 
MBL: Fix for negative x/y positions
 2016-05-29 22:07:35 -07:00
Scott Lahteine
dc22097b3a Fix some of array initializations 
- In `stepper.h` init `count_direction` array
- In `ultralcd.cpp` init `autotune_temp` array
 2016-05-29 20:55:13 -07:00
João Brázio
40e64b36de
Closes #3826: SD printing will now pause and stop the print counter 
The LCD menu items for SD printing pause/stop have been updated to control
also the print job timer. This commit also fixes a small output bug with
M78, the failed print counter was displaying the wrong value.
 2016-05-30 00:56:39 +01:00
Edward Patel
eb2746a34f MBL: Fix for negative x/y positions 2016-05-28 21:05:43 +02:00
Scott Lahteine
fe3122774a Merge pull request #3806 from thinkyhead/rc_coreyz_support 
Support for COREYZ. Fixes for COREXY, COREXZ
 2016-05-26 18:50:43 -07:00
Scott Lahteine
fad7680605 Slower SPI speed for MAX31855 2016-05-25 18:15:36 -07:00
Scott Lahteine
30f6b84561 Merge pull request #3812 from thinkyhead/rc_mbl_index_finders 
Two index finding functions for MBL
 2016-05-23 15:54:37 -07:00
Scott Lahteine
89e630b2fb Merge pull request #3808 from thinkyhead/rc_singlenozzle 
SINGLENOZZLE
 2016-05-23 15:52:19 -07:00
Scott Lahteine
827738a790 set_z parameters marked const 2016-05-23 14:25:43 -07:00
Scott Lahteine
9049f4084b EEPROM report uses G29 S3 2016-05-23 14:25:43 -07:00
Scott Lahteine
4955163959 Propose simpler probe index methods 2016-05-23 14:25:43 -07:00
Scott Lahteine
a1a5cb5393 Propose simpler cel index methods 2016-05-23 14:25:42 -07:00
Scott Lahteine
360adc6a3b Small reduction in M421 code 2016-05-23 14:25:42 -07:00
Scott Lahteine
a4ed988c60 Two index finding functions for MBL 2016-05-23 14:25:42 -07:00
Scott Lahteine
0e55c06f7d Rename CORE_AXIS_3 to NORMAL_AXIS 2016-05-23 13:58:40 -07:00
Scott Lahteine
5172d4ba40 COREYZ stepper, planner, endstop, babysteps 2016-05-23 13:58:40 -07:00
Scott Lahteine
6c7f4909b1 COREYZ Conditionals, SanityCheck for only a single kinematic 2016-05-23 13:58:40 -07:00
Scott Lahteine
95fee8ca81 Add option for CoreYZ kinematics 2016-05-23 13:58:40 -07:00
Scott Lahteine
678cbad76a Merge pull request #3819 from jbrazio/bugfix/followup-3813 
Followup for #3813
 2016-05-23 13:56:11 -07:00
AnHardt
bb66ffb2ae Correct hardware endstops default 
All credits to RicardoGA
 2016-05-23 10:54:22 +02:00
João Brázio
75221fa673
Followup for #3813 2016-05-22 13:14:58 +01:00
Scott Lahteine
f9b4b90058 Merge pull request #3813 from jbrazio/bugfix/3809 
Stopwatch and PrintCounter improvements
 2016-05-21 18:33:57 -07:00
João Brázio
8c0edb2de4
Fixes #3809 and adds several improvements to the Stopwatch and 
PrintCounter classes
 2016-05-22 01:59:59 +01:00
Scott Lahteine
c5130fd23b Additional instructions for controller reverse options 2016-05-20 18:14:50 -07:00
Scott Lahteine
cadf441059 Merge pull request #3798 from AnHardt/extend-M421 
Extend M421 with I and J parameters
 2016-05-20 16:17:23 -07:00
Scott Lahteine
0c7c45063b PID_ADD_EXTRUSION_RATE based on MarlinKimbra 2016-05-20 16:15:05 -07:00
Scott Lahteine
92ac133f2b Conditionals and Sanity Check for SINGLENOZZLE 2016-05-20 15:48:27 -07:00
Scott Lahteine
69abfef82e Add "SINGLENOZZLE" extruder option 2016-05-20 15:45:11 -07:00
AnHardt
f5a036510f Extend M421 with I and J parameters 
Extend M421 with I and J parameters
 2016-05-21 00:18:09 +02:00
Scott Lahteine
2f6e7b7b9b Merge pull request #3805 from MatixYo/patch-7 
Update language_pl.h to the latest strings
 2016-05-20 14:50:49 -07:00
Scott Lahteine
1a6c72cb57 Apply to the rest of the configs 2016-05-20 11:52:27 -07:00
Scott Lahteine
37c6d0f4ed Reword MESH_G28_REST_ORIGIN comment 2016-05-20 11:52:27 -07:00
Edward Patel
c7d90dc5ec Add option to configure G28 all axis resting position for MBL 2016-05-20 11:52:27 -07:00
Mateusz Juszczyk
bbe4c20ef6 Update language_pl.h 2016-05-20 13:24:34 +02:00
Scott Lahteine
319d184999 Merge pull request #3803 from jbrazio/feature/buildroot-cleanup 
Buildroot cleanup
 2016-05-19 21:34:11 -07:00
Scott Lahteine
a469341555 Merge pull request #3800 from jbrazio/feature/move-felix-cfg 
Moves Felix's dual configuration to a folder
 2016-05-19 18:53:39 -07:00
João Brázio
14652bb141
Moves shared helper scripts to the buildroot 2016-05-20 02:25:13 +01:00
João Brázio
80f05920c5
Moves Felix's dual configuration to a folder 2016-05-20 00:49:16 +01:00
Scott Lahteine
8218558953 Update comments, rename next_ping_ms, followup to #3797 2016-05-19 16:44:57 -07:00
Scott Lahteine
6d68b12e28 Merge pull request #3797 from AnHardt/fix-screen-updatedelay 
Rework intermediate idle() and manage_heater() calls in G2/G3 and G5
 2016-05-19 16:29:27 -07:00
AnHardt
e761bdbb4b Remove SF_ARC_FIX from G5 (Cubic B-spline) 
Remove SF_ARC_FIX from G5 (Cubic B-spline).
SF_ARC_FIX is a fix for G2/G3 (arcs) where Skeinforge always produced relative instead of absolute coordinates for the endpoint of an arc.
It's very unlikely this is also a problem with Cubic B-splines. More likely is copying from the G2/G3 code.
 2016-05-19 21:00:12 +02:00
AnHardt
2207001333 No compromises for the manage_heater() 
No compromises for the manage_heater(). manage_heater() will return immediately when there is nothing to do, but needs a constant detaT to work proper.
Calling idle() only every 200ms results in a display update every ~2 seconds - that should be enough.
For the other functionalities in idle() and manage_inactivity() 200ms is a lot but hopefully works.
 2016-05-19 20:52:11 +02:00
AnHardt
0c4d885d5b Speedup sreen update delay 
Speedup sreen update delay
and correct a comment.

A module division by 10 is slooooow. (powers of 2 are fast - but then you can AND a bitmask with the same result)
 2016-05-19 15:41:09 +02:00
Rafa Couto
9d416289cc Update Galician language to 1.1.0-RCBugFix. 2016-05-19 19:33:40 +09:00
Scott Lahteine
07c9a11c3c Automatically set X2 stepper pins 2016-05-18 19:09:09 -07:00
Scott Lahteine
8aa591ca09 Merge pull request #3789 from jbrazio/feature/m999-s-arg 
Implements S1 argument in M999
 2016-05-18 16:58:09 -07:00
Scott Lahteine
138c5c8378 Merge pull request #3788 from thinkyhead/rc_dual_x_compile_fix 
DUAL_X_CARRIAGE fixes, improvements, Travis test
 2016-05-18 16:56:54 -07:00
João Brázio
e6effb8f35
Implements S1 argument in M999 2016-05-19 00:13:33 +01:00
Scott Lahteine
2a7b1a85f7 Improve DUAL_X_CARRIAGE sanity check errors 2016-05-18 15:59:28 -07:00
Scott Lahteine
516e79bbda Declare extruder_duplication_enabled in Marlin.h 2016-05-18 15:51:44 -07:00
esenapaj
56d5ae596c Update Japanese trasration 
・Add new translation
・Change translation
 2016-05-18 20:42:50 +09:00
Scott Lahteine
4041508ffb Function decl. in headers don't need "extern" 2016-05-17 18:35:01 -07:00
Scott Lahteine
82c2d308dc Merge pull request #3783 from thinkyhead/rc_bezier_delta_fix 
Bezier style and DELTA patch
 2016-05-17 18:27:48 -07:00
Scott Lahteine
ecec5c5e58 Bezier style and DELTA patch 2016-05-17 18:06:10 -07:00
Scott Lahteine
d66e53c42b Merge pull request #3782 from thinkyhead/rc_home_z_before_g29 
Require homing of Z before G29
 2016-05-17 17:53:56 -07:00
Scott Lahteine
552516ddf5 Merge pull request #3781 from AnHardt/minor-delta-segmenting-speedup 
Minor DELTA segmentation speedup
 2016-05-17 17:17:38 -07:00
Scott Lahteine
a28970784c XYZ unhomed 2016-05-17 17:02:53 -07:00
Scott Lahteine
a9926b71a4 Require homing of Z before G29 2016-05-17 16:57:12 -07:00
AnHardt
41e9569dbc Minor DELTA segmentation speedup 
Minor DELTA segmentation speedup by pulling calculations out of the loop.
 2016-05-18 01:49:30 +02:00
Scott Lahteine
3016dfe484 Merge pull request #3744 from thinkyhead/rc_bezier_curves 
Add BEZIER_CURVE_SUPPORT — G5 command
 2016-05-17 13:57:38 -07:00
Scott Lahteine
d0ac4541d3 Merge pull request #3775 from jbrazio/bugfix/followup-3770 
G29: Report final position back to host when using MBL
 2016-05-17 13:55:26 -07:00
João Brázio
b6a3aef297
G29: Report final position back to host when using MBL 2016-05-17 01:27:59 +01:00
esenapaj
95f30529a6 Add stowing process for MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
esenapaj
e2b87f6c85 Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
Scott Lahteine
58339aea5f Merge pull request #3769 from jbrazio/bugfix/iteration-invokes-undef-behavior 
Bugfix: iteration invokes undefined behavior
 2016-05-15 20:36:25 -07:00
Scott Lahteine
26b4cb5b42 Merge pull request #3771 from thinkyhead/rc_auto_fans_again 
Fix checkExtruderAutoFans
 2016-05-15 20:32:31 -07:00
Scott Lahteine
c9271e610b Merge pull request #3762 from jbrazio/bugfix/lcd-hide-bed-icon 
Remove the hotbed icon from the status screen
 2016-05-15 19:11:05 -07:00
Scott Lahteine
2f14934c65 Fix checkExtruderAutoFans 
Make sure to only set the fan state once when extruders share a fan
 2016-05-15 18:54:37 -07:00
João Brázio
ecd490ed49
Bugfix: iteration invokes undefined behavior 2016-05-15 22:45:08 +01:00
Scott Lahteine
abdfd914f8 Merge pull request #3763 from esenapaj/patch-4 
Follow-up for #3720 and #3759
 2016-05-15 12:37:51 -07:00
Scott Lahteine
754b0152f5 Fix MBL zigzag calls 2016-05-15 12:35:01 -07:00
esenapaj
6d722716f7 Follow-up the PR #3720 and #3759 
Update forgotten Configuration_DUAL.h
 2016-05-15 14:08:45 +09:00
João Brázio
451000387d
Remove the hotbed icon when HAS_TEMP_BED is false 2016-05-15 03:00:05 +01:00
Scott Lahteine
a058226799 Prevent watchdog timeout in bezier moves 2016-05-14 17:41:16 -07:00
Scott Lahteine
13175ce7da Fix error checking in M421 2016-05-14 17:12:44 -07:00
Scott Lahteine
bc5a547d55 More robust MBL index / point conversion 2016-05-14 16:45:56 -07:00
Scott Lahteine
a3520b6f01 More precision in M503 output for MBL's M421 2016-05-14 16:19:37 -07:00
Scott Lahteine
1b90682617 Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 
Remove need to define unused pins as -1 in pins files
 2016-05-14 15:49:22 -07:00
Scott Lahteine
c8a40f06a6 Merge pull request #3759 from thinkyhead/rc_more_printcounter 
Printcounter bugfix and some new features
 2016-05-14 15:36:31 -07:00
Scott Lahteine
585c8a918f Merge pull request #3758 from thinkyhead/rc_verbiage 
Tweaks to some verbiage
 2016-05-14 15:27:11 -07:00
João Brázio
f9a62f6a8e Added PRINTJOB_TIMER_AUTOSTART section to example config files 2016-05-14 15:22:45 -07:00
João Brázio
8a18c52002 Adds an option to disable print job timer auto start 2016-05-14 15:22:44 -07:00
João Brázio
a79267217b M78 now allows stats reset using the S78 argument 2016-05-14 15:22:44 -07:00
João Brázio
b660f1bdb8 Bugfix: Multiple M77 no longer increment the print counter 2016-05-14 15:22:43 -07:00
Scott Lahteine
c63f95f2fe Merge pull request #3748 from clexpert/patch-1 
Lastest changes in Czech translate
 2016-05-14 15:12:39 -07:00
Scott Lahteine
e01e52969e Merge pull request #3757 from thinkyhead/rc_fix_auto_fans 
Don't try to enable unused auto fans
 2016-05-14 15:09:24 -07:00
Scott Lahteine
ddf3e1e22d Tweaks to some verbiage 2016-05-14 15:06:09 -07:00
Scott Lahteine
a713043acd Merge pull request #3749 from esenapaj/patch-3 
Enclose all #error strings by double-quotes
 2016-05-14 15:01:56 -07:00
Scott Lahteine
3cfea3ff12 Merge pull request #3752 from AnHardt/fix-FIX_MOUNTED_PROBE 
G29 missing FIX_MOUNTED_PROBE condition
 2016-05-14 15:00:42 -07:00
Scott Lahteine
08dfe08f9a Merge pull request #3754 from jbrazio/feature/update-pt_PT 
Updated pt_PT language pack
 2016-05-14 15:00:12 -07:00
Scott Lahteine
596ebccd54 Merge pull request #3753 from jbrazio/feature/followup-3740 
Warn user about useless of individual axis homing and DELTA kinematics
 2016-05-14 14:59:49 -07:00
Scott Lahteine
6e3556cb75 Merge pull request #3746 from esenapaj/patch-2 
Update Japanese translation
 2016-05-14 14:57:43 -07:00
Scott Lahteine
ddac17a195 Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ) 2016-05-14 14:52:08 -07:00
Scott Lahteine
b4c891dfd2 Remove obsolete reference to prepare_arc_move 2016-05-14 14:51:09 -07:00
Scott Lahteine
9f6b8f7d5b Remove extra @section directive from configs 2016-05-14 14:51:09 -07:00
Scott Lahteine
4d6bb52b26 Don't try to enable unused auto fans 
Addressing #3743
 2016-05-14 14:46:14 -07:00
Scott Lahteine
f13c4a9ec4 Merge pull request #3720 from jbrazio/feature/host-keepalive 
Removes the DISABLE from HOST_KEEPALIVE
 2016-05-14 14:39:31 -07:00
João Brázio
596f15348d
Updated pt_PT language pack 2016-05-14 01:45:15 +01:00
João Brázio
d7522152e1
Warn user about useless of individual axis homing and DELTA kinematics 2016-05-14 01:35:05 +01:00
AnHardt
8a4376d51f Idle during long arcs 
Idle during long arcs
to prevent from watchdog resets during high segmented fast arcs.
 2016-05-14 00:29:13 +02:00
esenapaj
888443ca1e Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
Petr Zahradnik
50b1a6bb2b Lastest changes in Czech translate 2016-05-13 13:51:13 +02:00
AnHardt
b74af78736 Make arc support (G2/G3) configurable 
Saves about 2669 bytes when deactivated. (About 1% for a AT2560, about __4%__ for a AT644!)
 2016-05-13 13:27:45 +02:00
AnHardt
aef2559bd8 fix-FIX_MOUNTED_PROBE 
Add a forgotten condition
 2016-05-13 12:07:17 +02:00
esenapaj
e9d851137d Update Japanese translation 
・Add new translation
 2016-05-13 18:52:35 +09:00
Scott Lahteine
14cd0f4c92 Merge pull request #3740 from thinkyhead/rc_lcd_home_options 
Individual Axis Homing LCD menu items
 2016-05-12 11:59:46 -07:00
esenapaj
69511b5e5e Follow-up the PR #3719(Harmonize LCD comment section) 
It update forgotten Configuration_DUAL.h.
 2016-05-12 19:16:36 +09:00
Scott Lahteine
675e92ab1f Merge pull request #3738 from thinkyhead/rc_limit_i2c_request 
Print an error on bad i2c request
 2016-05-11 19:36:49 -07:00
João Brázio
09150cae79 Individual Axis Homing LCD menu items 2016-05-11 19:28:19 -07:00
Scott Lahteine
4dc4e2063f Add REVERSE_ENCODER_DIRECTION option 2016-05-11 15:39:28 -07:00
Scott Lahteine
aaeadf0cbd If no "B" parameter given, get 1 byte 2016-05-11 15:30:08 -07:00
Scott Lahteine
a6d594665b Print an error on bad i2c request 
Reference: https://github.com/MarlinFirmware/Marlin/pull/3713#issuecomment-218333678
 2016-05-11 15:30:02 -07:00
João Brázio
85b2c80838
Updated example configurations 2016-05-11 01:45:49 +01:00
João Brázio
ac7f634956
Removed the DISABLE from HOST_KEEPALIVE_FEATURE option 2016-05-11 01:45:49 +01:00
Scott Lahteine
a454a88f9c Merge pull request #3722 from jbrazio/bugfix/printcounter 
Minor #warning fix for PrintCounter
 2016-05-10 17:17:04 -07:00
Scott Lahteine
03bda5c141 Merge pull request #3719 from jbrazio/feature/update-configs 
Harmonize LCD comment section
 2016-05-10 17:16:23 -07:00
Scott Lahteine
c827671299 Mention Z_PROBE_ALLEN_KEY in probe sanity checks 2016-05-10 13:50:20 -07:00
Scott Lahteine
be5d17de17 Merge pull request #3713 from thinkyhead/rc_file_offset_long 
Use code_value_long for potentially large values
 2016-05-10 09:15:53 -07:00
Scott Lahteine
56dd31ea3c Use code_value_long for potentially large values 
Addressing #3711
 2016-05-10 09:15:31 -07:00
João Brázio
eafa16a781
Minor #warning fix for PrintCounter 2016-05-10 14:14:54 +01:00
João Brázio
5373ac6373
Updated example configurations 2016-05-10 13:42:00 +01:00
João Brázio
aa5a4716cf
Update default config 2016-05-10 13:37:21 +01:00
esenapaj
1a75509a3c Cleanup for Danish file 
・Arrange the strings in unified order
・Remove "#ifdef DELTA_CALIBRATION_MENU" directive
・Adjust spacing
 2016-05-10 02:43:25 +09:00
esenapaj
cf6c607425 Update Japanese translation 
・Add new translation
・Add translation for 16 width ASCII LCD
・Change translation
・Revert translation from Japanese to English
・Fix typo
 2016-05-10 02:43:24 +09:00
Scott Lahteine
6f36b7c1cd Merge pull request #3224 from yarda/fix-melzi2-arduino-1.6.x 
Fixed Makefile to work with Melzi2 boards on arduino-1.6.x
 2016-05-08 19:33:37 -07:00
Scott Lahteine
050e0bd2af Merge pull request #3705 from thinkyhead/rc_runaway_logic 
Fallthru in thermal runaway test when TRState changes
 2016-05-08 19:00:24 -07:00
Scott Lahteine
5f7ad16b19 Merge pull request #3707 from thinkyhead/rc_fix_delta_blocking_move 
Fix dipping on DELTA robots during G29
 2016-05-08 18:42:57 -07:00
Scott Lahteine
96b71e62c0 Fix dipping on DELTA robots during G29 
- Addressing #3689, et. al.
 2016-05-08 18:28:46 -07:00
Scott Lahteine
ea1dd31851 Enclose #error strings with apostrophes in quotes 2016-05-08 18:08:39 -07:00
Scott Lahteine
9b92bb8f31 Set the initial state based on target temperature 2016-05-08 17:25:44 -07:00
Scott Lahteine
6b13c430ae The TRReset state is not needed with fall-through 2016-05-08 17:01:46 -07:00
Scott Lahteine
c2522ce1f5 Fallthru in thermal runaway test when TRState changes 2016-05-08 16:51:33 -07:00
Scott Lahteine
d32d9a3c5c Merge pull request #3672 from thinkyhead/rc_consolidate_probe_flags 
Cleanup and consolidate probe conditionals for clarity
 2016-05-08 16:42:22 -07:00
Scott Lahteine
15fc93d742 Cleanup and consolidate probe conditionals for clarity 2016-05-08 12:59:43 -07:00
Scott Lahteine
5ca6334fd2 Cleanup pins files, fixup analogtodigitalpin, etc. 2016-05-08 12:38:00 -07:00
esenapaj
9186be7b83 Fix compilation error in debugging code 
Fix compilation error in Thermal Runaway debugging code
 2016-05-09 01:57:21 +09:00
Scott Lahteine
51109d4af7 Use AxisEnum with _lcd_babystep() 2016-05-05 21:04:30 -07:00
Scott Lahteine
b65ea98d6b Localize babystepping in the Temperature class 
So that `ultralcd.cpp` doesn’t need to worry about the details.
 2016-05-05 15:00:31 -07:00
Scott Lahteine
0c7beb832c Merge pull request #3681 from esenapaj/patch-1 
Follow-up the PR #3643(Temperature singleton)
 2016-05-05 12:47:06 -07:00
Scott Lahteine
fc5fe2cc22 Merge pull request #3678 from jbrazio/rework/delta-diagonal-rod-timmers 
Moved DELTA radius/rod default trimmer values to Conditionals.h
 2016-05-05 11:38:14 -07:00
esenapaj
1a97442d19 Follow-up the PR #3643(Temperature singleton) 
Follow-up the PR #3643(Temperature singleton)

・Change from fanSpeedSoftPwm[0] to thermalManager.fanSpeedSoftPwm[0] in planner.cpp
It fix compilation error when FAN_SOFT_PWM is enabled.

・Remove declaration of setExtruderAutoFanState() in temperature.h
Because that function was abolished.

・Change from babystepsTodo to thermalManager.babystepsTodo in ultralcd.cpp
It fix compilation errors when BABYSTEPPING is enabled.
 2016-05-05 18:01:39 +09:00
Scott Lahteine
4f6120f70f Merge pull request #3643 from thinkyhead/rc_singletons_plus_temperature 
Temperature singleton
 2016-05-04 20:41:46 -07:00
Scott Lahteine
084f6b5b44 Temperature singleton class 2016-05-04 19:42:12 -07:00
Scott Lahteine
142bd3f3e7 Disable THERMAL_PROTECTION_BED with no sensor 2016-05-04 19:36:51 -07:00
Scott Lahteine
13f85a2b50 Can't use the ENABLED macro as a boolean 2016-05-04 16:33:57 -07:00
João Brázio
23567a1d8b
Moved DELTA radius/rod default trimmer values to Conditionals.h 2016-05-05 00:18:32 +01:00
Scott Lahteine
b4b5c7a6b7 Merge pull request #3670 from thinkyhead/rc_scoovo_controller 
Use directional buttons when defined
 2016-05-03 17:42:18 -07:00
Scott Lahteine
6398d497b3 Ultimate followup to Stepper/Planner patch 
- Search all symbols and apply prefixes where needed
- Encapsulate some private methods
- Inline some setters
- Make `microstep_mode` a public method
 2016-05-03 17:07:37 -07:00
Scott Lahteine
ddafb859e2 Use directional buttons when defined 2016-05-03 12:50:49 -07:00
Scott Lahteine
b959020532 Merge pull request #3667 from esenapaj/patch-1 
Additional follow-up the PR #3631(Encapsulate S...
 2016-05-03 09:36:09 -07:00
esenapaj
212b17d510 Fix for PR #3526(Configuration.h LCD & SDCard s... 
Fix for PR #3526(Configuration.h LCD & SDCard section rewrite)

It removes duplicated BQ_LCD_SMART_CONTROLLER.
 2016-05-03 21:35:02 +09:00
esenapaj
605808fe37 Additional follow-up the PR #3631(Encapsulate S... 
Additional follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

・Change from abort_on_endstop_hit to stepper.abort_on_endstop_hit in endstop.cpp, Marlin_main.cpp, and ultralcd.cpp
・Add include path to cardreader.h and temperature.h in endstop.cpp(for CardReader class and disable_all_heaters())
It fix compilation error when ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED and SDSUPPORT are enabled.

・Change from digipot_current() to stepper.digipot_current() in Marlin_main.cpp
・Change from digitalPotWrite() to stepper.digitalPotWrite() in Marlin_main.cpp
It fix compilation errors when HAS_DIGIPOTSS is enabled.

・Change from microstep_mode() to stepper.microstep_mode() in Marlin_main.cpp
・Change attribute of microstep_mode() from private to public in stepper.h
・Change from microstep_readings() to stepper.microstep_readings() in Marlin_main.cpp
・Change from microstep_ms() to stepper.microstep_ms() in Marlin_main.
It fix compilation errors when HAS_MICROSTEPS is enabled.
 2016-05-03 18:28:37 +09:00
Scott Lahteine
7fd0243048 Cleanup, debug strings in Planner::adjusted_position 2016-05-02 20:11:27 -07:00
Scott Lahteine
85e732d5fd Fix BABYSTEPPING, add it to Travis test 2016-05-02 20:01:00 -07:00
Scott Lahteine
37c4970d87 Merge pull request #3660 from esenapaj/patch-2 
Follow-up the PR #3631(Encapsulate Stepper, ...
 2016-05-02 15:23:38 -07:00
Scott Lahteine
ad27d3c523 Merge pull request #3659 from esenapaj/patch-1 
Some clean-up for example configuration files
 2016-05-02 15:22:29 -07:00
Scott Lahteine
f1c1a8dc59 Merge pull request #3661 from Blue-Marlin/83filen2 
8.3-filenames second try
 2016-05-02 14:47:26 -07:00
Jochen Groppe
0bae00c1ed Merge pull request #3644 from tkurbad/german_translation 
Revisited German translation
 2016-05-02 16:46:19 +02:00
Blue-Marlin
5ad7d263e9 8.3-filenames second try 
Fix for #6 3593, #3648
this time excludung 'DEL' instead of accidently '~'.
 2016-05-02 15:58:04 +02:00
Torsten Kurbad
aae2f502e0 Revisited German translation 2016-05-02 15:18:12 +02:00
esenapaj
a82cfcff2d Follow-up the PR #3631(Encapsulate Stepper, ... 
Follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

plan_bed_level_matrix -> planner.bed_level_matrix in multi extruders section of Marlin_main.cpp
It probably fix the Issue #3658(plan_bed_level_matrix not declarate).

movesplanned() -> planner.movesplanned() in ADVANCED_OK section of Marlin_main.cpp
It fix compilation error when ADVANCED_OK is enabled
 2016-05-02 22:04:26 +09:00
esenapaj
2fa4bc344c Some clean-up for example configuration files 
Some clean-up for example configuration files

Follow-up and fix the PR #3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR #3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR #3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR #3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
 2016-05-02 21:16:00 +09:00
Scott Lahteine
da47b83b3d Revert PR 3648 to fix SD printing 
The character 0x7E is common in 8.3 filenames. Maybe the last condition
should be removed completely instead.
 2016-05-01 18:04:04 -07:00
Scott Lahteine
60c6efb75c Merge pull request #3653 from thinkyhead/rc_bed_temp_watch_merge 
Introduce temp watch protection for the bed
 2016-05-01 13:58:28 -07:00
Scott Lahteine
5b7a6c217a Include more fans in sensitive pins list 2016-05-01 13:49:32 -07:00
Scott Lahteine
f508c54c6c Use #undef in AZTEEG_X3_PRO for RAMPS overrides 2016-05-01 13:49:32 -07:00
Scott Lahteine
c6f1337f5c NOOP macro for do-nothing macros 2016-05-01 13:49:32 -07:00
Scott Lahteine
c2145566c7 Merge pull request #3631 from thinkyhead/rc_singletons 
Encapsulate Stepper, Planner, Endstops in singleton classes
 2016-05-01 13:47:47 -07:00
Scott Lahteine
fbf69081b4 Updated comment for THERMAL_PROTECTION_BED 2016-05-01 13:12:51 -07:00
gralco
908229dbb3 Introduce temp watch protection for the bed 
When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function.

Conflicts:
	Marlin/Configuration_adv.h
 2016-05-01 13:12:51 -07:00
Scott Lahteine
77d6e5283b Merge pull request #3648 from Blue-Marlin/83filenames 
Don't reject 8.3-filenames with chars > 0x7f
 2016-04-30 17:48:03 -07:00
Scott Lahteine
24a15332b3 Encapsulate dual Z endstop handling 2016-04-30 17:26:50 -07:00
Scott Lahteine
462a8a951e A little extra gcode_T spacing 2016-04-30 17:26:50 -07:00
Scott Lahteine
96f51f400f Planner singleton class 2016-04-30 17:26:50 -07:00
Scott Lahteine
5076d12344 Localize M119 in Endstops class 2016-04-30 17:26:50 -07:00
Scott Lahteine
5e4e535ce8 Stepper and Endstops as singleton objects 2016-04-30 17:26:50 -07:00
Scott Lahteine
6d3e4e1f8f Prevent stuck M109/M190 when target is changed 2016-04-30 17:03:54 -07:00
Blue-Marlin
ac4caab8f1 Don't mangel 8.3-filenames with chars > 0x7f 
Don't mangel 8.3-filenames with chars > 0x7f

Windows produces 8.3filenames wit chars > 0x7f. Those have been rejected
by Marlin until now.

With these 'malformed' filenames can now be worked with:
In the LCD menue
With RepetierHost (V1.6.1 tested) - full support. Characters are
displayed as '?'
With Octoprint (1.2.10 tested) the files do not appear in the files
area. At the console, listed with M20 they appear with a '�'.
With Pronterface the files appear in the sd-window but you can't start
them. They are mangled by pronterface. The names are altered and than
recected by Marlin. In the console they apper with differen but not the
correct characters.

All in all a little step forward.

Fix for #3593
 2016-04-30 17:37:22 +02:00
Scott Lahteine
eeef571be2 Merge pull request #3613 from thinkyhead/rc_acceleration_fix1 
Fix an acceleration anomaly by making locals signed
 2016-04-29 16:39:31 -07:00
Scott Lahteine
c3ef9993b9 Merge pull request #3625 from jbrazio/feature/print-counter 
Print job statistics
 2016-04-29 15:31:14 -07:00
Scott Lahteine
96b2b3f4fe Merge pull request #3642 from thinkyhead/rc_quieter_wait_for_temps 
Keepalive not needed while waiting for temperatures
 2016-04-29 15:20:12 -07:00
João Brázio
e34f4653ef
Fixed a typo on the configuration files 2016-04-29 23:13:59 +01:00
João Brázio
1491d682fb
Miscellaneous tweaks on PrintCounter 2016-04-29 23:13:59 +01:00
João Brázio
27088e356f
Updated example configuration files 2016-04-29 23:13:59 +01:00
João Brázio
8fb23e899f
PrintCounter EEPROM read/write optimizations 2016-04-29 23:13:59 +01:00
João Brázio
9589e51810
Disable DEBUG_PRINTCOUNTER 2016-04-29 23:13:59 +01:00
João Brázio
e2da7e5000
Updated the default configuration and fixed a printcounter.h typo 2016-04-29 23:13:58 +01:00
João Brázio
d6cfcc9c8b
Added new G-Code: M78 2016-04-29 23:13:58 +01:00
João Brázio
4f541c5bb5
Added a new object: PrintCounter 2016-04-29 23:13:58 +01:00
João Brázio
26b166d7cf
Made all stopwatch::debug() calls static 2016-04-29 23:13:58 +01:00
Scott Lahteine
5897b58a70 Merge pull request #3634 from esenapaj/patch-2 
Update distribution date and readme again
 2016-04-28 21:19:08 -07:00
Scott Lahteine
f4706bb90e Keepalive not needed while waiting for temperatures 2016-04-28 21:11:15 -07:00
Scott Lahteine
924285afa6 Merge pull request #3641 from thinkyhead/rc_reverse_menu_doc 
Correct the REVERSE_MENU_DIRECTION comment
 2016-04-28 20:28:46 -07:00
Scott Lahteine
f1b00eb12b Correct the REVERSE_MENU_DIRECTION comment 2016-04-28 20:27:17 -07:00
Scott Lahteine
8905908081 Merge pull request #3632 from thinkyhead/i3_millie_language_fun 
Simplified LCD Language settings
 2016-04-28 19:52:10 -07:00
Scott Lahteine
6c48852b20 Update distribution date 2016-04-28 18:06:53 +09:00
Scott Lahteine
2142d5a62e Merge pull request #3627 from Blue-Marlin/German-again-and-again-and-agin 
Correct an error in lang_de
 2016-04-27 20:14:15 -07:00
Scott Lahteine
0c11566f42 Replace LANGUAGE_INCLUDE with LCD_LANGUAGE 2016-04-27 20:06:40 -07:00
Scott Lahteine
259794c0be Make DISPLAY_CHARSET_HD44780 a single setting 2016-04-27 20:06:40 -07:00
Blue-Marlin
e89f01d044 Correct an error in lang_de 
There is no way to translate "A-travel" to "A Rückzug". Thats simply
wrong.
 2016-04-27 12:59:48 +02:00
esenapaj
ee2f37f3cc Update distribution date and readme 
It sync with the RC.
 2016-04-27 11:21:51 +09:00
Scott Lahteine
ad0f70f2f3 Merge pull request #3620 from Blue-Marlin/feedrate_atfer_toolchange 2016-04-26 17:33:15 -07:00
Scott Lahteine
d58c5ac446 Merge pull request #3618 from esenapaj/patch-1 2016-04-26 17:20:04 -07:00
Scott Lahteine
2bb5cf5291 Merge pull request #3622 from floyd871/patch-1 2016-04-26 17:14:36 -07:00
Blue-Marlin
e58e281473 Fix feedrate after toolchange 
The fix is simple. Most changes are because of changed indendation,
bacause of leaving early for wrong tool number
 2016-04-27 00:57:45 +02:00
João Brázio
32d798fcc7
Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
Michael Neumann
59cfc84dad German "Umlaute" 
We don't have to  avoid German "Umlaute" any more.
 2016-04-26 21:52:05 +02:00
Matt Keveney
4dfc496965 added recalc_delta_settings() call in Config_RetrieveSettings. Appears to be necessary any time delta-related parameters (M665) are modified 2016-04-26 20:01:53 +09:00
Scott Lahteine
ec82e1e05d Merge pull request #3616 from thinkyhead/rc_fixup_some_movement 
General cleanup around high level move functions
 2016-04-25 20:23:38 -07:00
Scott Lahteine
abeab792cb General cleanup around high level move functions 
- Use new `DEBUG_POS` macro for `DELTA` debug
- Neaten up `prepare_move` a smidgen
- Remove an old commented `prepare_move()` line
 2016-04-25 20:02:24 -07:00
Scott Lahteine
66540f8b84 Merge pull request #3615 from thinkyhead/rc_whats_up_with_M112 
Report current position to host after M206 / M428
 2016-04-25 18:58:41 -07:00
Scott Lahteine
68d0347e67 Call report_current_position after M206 / M428 2016-04-25 18:43:28 -07:00
Scott Lahteine
dcb4cdaa9e Call report_current_position instead of gcode_M114 directly 2016-04-25 18:43:27 -07:00
Scott Lahteine
e38baaa23e Fix an acceleration anomaly by making locals signed 2016-04-25 14:17:20 -07:00
João Brázio
739dcda0f1
Renamed stopwatch::status to stopwatch::state 2016-04-25 17:40:43 +01:00
gralco
840e13f664 Introduce M108 cancel heatup for the hotend and bed 
This G-code is asynchronously handled in the get_serial_commands() parser.
 2016-04-25 08:33:33 -06:00
Scott Lahteine
fce1e843b9 Patch steps rate comment in trapezoid function 2016-04-24 19:38:58 -07:00
João Brázio
7de0161204
Updated example config files 2016-04-24 05:21:17 +01:00
João Brázio
3b6f75511f
Updated multiple pins files 2016-04-24 05:21:17 +01:00
João Brázio
170f7e8a45
Rework Marlin's versioning system 2016-04-24 05:21:17 +01:00
esenapaj
8d0b2f358a Cleanup for language files 
・Remove abolished strings (MSG_NOZZLE1, MSG_NOZZLE2)
・Remove duplicated strings 
・Arrange the strings in unified order
・Adjust spacing
・Remove some comments in Japanese files(follow-up the PR #3560)

The most part of these changes were salvaged from closed my PR#3550.
 2016-04-23 13:27:05 +09:00
Scott Lahteine
2bb56ef6de Merge pull request #3597 from thinkyhead/rc_fix_g29_debug 
Move G29 debug output before matrix.set_to_identity()
 2016-04-22 21:21:00 -07:00
João Brázio
a901555da4 Moved G29 debug output before matrix.set_to_identity() 2016-04-22 20:57:22 -07:00
Scott Lahteine
88c6693b9e Fix a typo in #3586 to fix MBL 2016-04-22 20:04:08 -07:00
Scott Lahteine
aaf9d19954 Allow Z_SAFE_HOMING to compile without a probe 2016-04-21 15:55:49 -07:00
Scott Lahteine
92ab2c7dd8 Merge pull request #3587 from thinkyhead/rc_z_safe_homing_deps 
Define dependencies for Z_SAFE_HOMING if left out
 2016-04-21 15:46:24 -07:00
Scott Lahteine
63142eef40 Define dependencies for Z_SAFE_HOMING if left out 2016-04-21 15:22:19 -07:00
Scott Lahteine
173334e535 Merge pull request #3418 from jbrazio/translate/danish 
Missing Danish translation
 2016-04-21 14:56:43 -07:00
João Brázio
fe4fc88494
Closes #3351: missing Danish translation 2016-04-21 21:31:47 +01:00
Scott Lahteine
003aab6dfd Revert MBL menus to "known" working point 2016-04-21 12:59:55 -07:00
Scott Lahteine
6fac4d9211 Merge pull request #3579 from thinkyhead/rc_fix_dogm_and_mbl_menus 
Fix menu redraw for DOGLCD, improve MBL
 2016-04-20 20:52:56 -07:00
Scott Lahteine
7ddaa79ffe Merge pull request #3578 from thinkyhead/rc_fix_twibus_less_debug_code 
Reduce PROGMEM usage by TWIBus, stopwatch
 2016-04-20 20:52:16 -07:00
Scott Lahteine
cfd10fcba1 Merge pull request #3577 from thinkyhead/rc_fix_G92_set_e_twice 
Fix G92 setting E twice
 2016-04-20 20:52:09 -07:00
Scott Lahteine
dc2281d2f4 Add nextMenu, nextEncoderPosition to change menus after handler loop 2016-04-20 20:19:12 -07:00
Scott Lahteine
7fa2bda1b9 Give the "alive dot" its own blink 2016-04-20 18:57:17 -07:00
Scott Lahteine
9d5e1f32fd Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing 2016-04-20 18:53:33 -07:00
Scott Lahteine
0c2aa92b07 Z Safe Homing for all 
The `Z_SAFE_HOMING` feature is coupled with probes and not leveling, so
make it available for general use.
 2016-04-20 17:04:52 -07:00
Scott Lahteine
9bcb72e7f8 Further patches to MBL - break up into more handlers 2016-04-20 16:37:35 -07:00
Scott Lahteine
3f6ae85748 Fix some MBL display issues for DOGLCD 2016-04-20 16:36:45 -07:00
Scott Lahteine
71b4f189bf lcd_implementation_drawedit can take 1 arg 2016-04-20 16:36:45 -07:00
Scott Lahteine
1caa2628da Use sync_plan_position_e function elsewhere 2016-04-20 13:02:19 -07:00
Scott Lahteine
c7df961144 Fix G92 so it only sets the plan position once 2016-04-20 13:01:58 -07:00
Scott Lahteine
1addb50b62 Shrink debug code in TWIBus and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine
21a6b66807 Shrink debug code in Stopwatch and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine
e523a0dc61 Fix bug in TWIBus ctor declaration 2016-04-20 12:37:46 -07:00
Scott Lahteine
ee9bd66a68 Add comments to debug bit flags 2016-04-20 12:37:22 -07:00
Scott Lahteine
3db5a75f30 Merge pull request #3568 from thinkyhead/rc_various_fixes 
General code cleanup, improved naming, etc.
 2016-04-19 20:53:38 -07:00
Scott Lahteine
8a2587f017 Read size for MAX6675 from sizeof(max6675_temp) 2016-04-19 19:57:32 -07:00
Scott Lahteine
ac69fad96d lowercase "stop" function 2016-04-19 19:43:54 -07:00
Scott Lahteine
39ee9c526b setTargetedHotend => get_target_extruder_from_command 2016-04-19 19:43:54 -07:00
Scott Lahteine
cafa8b8ce3 Rename filament runout items 2016-04-19 19:43:39 -07:00
Scott Lahteine
27b2e2e786 Document some variables 2016-04-19 19:43:39 -07:00
Scott Lahteine
a4062a47ac Rename baricuda variables 2016-04-19 19:43:38 -07:00
Scott Lahteine
78747b1328 min_pos/max_pos => sw_endstop_min/sw_endstop_max 2016-04-19 19:43:38 -07:00
Scott Lahteine
ba84d8d091 Allow setting PIDTEMP and PIDTEMPBED together or apart 2016-04-19 18:09:29 -07:00
Scott Lahteine
5cb8ec68ae Merge pull request #3566 from thinkyhead/rc_babystep_show_steps 
Show steps done in the babystep display
 2016-04-18 21:52:55 -07:00
Scott Lahteine
3083ee49f3 Merge pull request #3567 from thinkyhead/rc_mf_bash_scripts 
Git helper shell scripts for MarlinFirmware
 2016-04-18 21:41:24 -07:00
Scott Lahteine
00d36d10e2 Merge pull request #3560 from thinkyhead/rc_better_graphical_lcd 
Aesthetic, functional improvements for Graphical Display
 2016-04-18 21:38:02 -07:00
Scott Lahteine
dd94ce5bd5 Merge pull request #3565 from thinkyhead/rc_look_at_3563 
Output error message for M303 if PIDTEMP is disabled
 2016-04-18 21:22:50 -07:00
Scott Lahteine
9a12054e0e Git helper shell scripts for MarlinFirmware 2016-04-18 21:18:35 -07:00
Scott Lahteine
4f04bf7fe8 Show steps done in the babystep display 2016-04-18 20:52:38 -07:00
Scott Lahteine
d988708ceb Merge pull request #3559 from esenapaj/patch-1 
Update and change Japanese translation
 2016-04-18 20:17:54 -07:00
Scott Lahteine
026ae8f2f0 Call lcd_setFont only when needed 2016-04-18 20:09:04 -07:00
Scott Lahteine
90c97c8185 Add _draw_axis_label function to reduce source 2016-04-18 20:09:04 -07:00
Scott Lahteine
34b17d4a8a Reduce heater status code if no bed 2016-04-18 20:09:04 -07:00
Scott Lahteine
fc30aa9d88 Aesthetic and functional improvements for graphical LCD 2016-04-18 20:09:04 -07:00
Scott Lahteine
b281001329 Use MSG_X, etc., on Hitachi LCD 2016-04-18 20:09:04 -07:00
Scott Lahteine
f90a8661cb Uppercase XYZE on Graphical LCD 2016-04-18 20:09:03 -07:00
Scott Lahteine
3613c550fa Rename README file for fonts 2016-04-18 20:09:03 -07:00
esenapaj
1110814ecf Update and change Japanese translation 
Update and change Japanese translation

・Follow-up the PR #3411(Update Readme.fonts about Kana), Remove "who really..." strings. I had forgotten it.
・Add readable translated strings in comment
・Add Japanese translation.
  MSG_LCD_ENDSTOPS "エンドストップ"
  (utf8 version only. Because non-utf8 version ("ｴﾝﾄﾞｽﾄｯﾌﾟ") over 8 characters)
・Change translation.
  MSG_ACC "カソクド mm/s2"
  MSG_ACC "\xb6\xbf\xb8\xc4\xde mm/s2" ("ｶｿｸﾄﾞ mm/s2")
 2016-04-19 11:28:26 +09:00
Scott Lahteine
a26d70e932 Apply indentation to gcode_M303, PID_autotune 2016-04-18 19:04:45 -07:00
Scott Lahteine
ba66336503 Output error for disabled M303 2016-04-18 19:03:45 -07:00
Scott Lahteine
eda821ca1c Merge pull request #3556 from philfifi/fix_pullup 
Fix bug in pullups handling for Z_MIN_PROBE
 2016-04-18 18:04:26 -07:00
Scott Lahteine
25b1556a94 Merge pull request #3552 from tnw513/fix_endstops_witbox 
Endstop settings modified (witbox). Issue #3547
 2016-04-18 18:03:22 -07:00
Scott Lahteine
2bc2485313 Update font remarks in Conditionals.h 2016-04-18 17:33:41 -07:00
Philippe LUC
86c868771b Fix bug in pullups handling for Z_MIN_PROBE 2016-04-18 21:16:23 +02:00
Silvio Didonna
91de69bb6e Endstop settings modified. Witbox have max endstops for X and Y. 2016-04-18 16:46:19 +02:00
Scott Lahteine
f2558b1f2c Additional delta config updates 2016-04-17 20:04:52 -07:00
Marc Urben
9a661bdd59 Updated Kossel XL config files for the latest Marlin 2016-04-17 20:04:19 -07:00
Scott Lahteine
09c6323b68 Merge pull request #3543 from thinkyhead/rc_better_bootscreen 
Better splash screen consolidation
 2016-04-17 17:20:13 -07:00
Scott Lahteine
5905ec5ba8 Merge pull request #3541 from thinkyhead/rc_mbl_one_last_lift 
Add a final lift, if configured, in Manual Bed Leveling
 2016-04-17 17:20:02 -07:00
Scott Lahteine
af1711365b Merge pull request #3538 from jbrazio/bugfix/endtop-hit-redeclared 
_ENDSTOP_HIT redeclared
 2016-04-17 17:12:56 -07:00
Scott Lahteine
ed622ac796 Better splash screen consolidator 2016-04-17 17:06:07 -07:00
Jeff K
90c49f5a14 Fixed invalid addressing (overflow) of position_shift / software endstops 
Signed-off-by: Jeff K
 2016-04-17 19:28:50 -04:00
João Brázio
bcf1e027bb
Fix the redeclaration of _ENDSTOP_HIT 2016-04-17 18:37:37 +01:00
Scott Lahteine
c242bee449 Add a final lift, if configured, in Manual Bed Leveling 2016-04-17 00:12:46 -07:00
Scott Lahteine
b6227932f5 Merge pull request #3530 from thinkyhead/rc_set_rcbugfix_for_now 
Set version for RCBugFix
 2016-04-16 21:40:55 -07:00
Scott Lahteine
19741a0ba6 Merge pull request #3503 from thinkyhead/rc_lcd_endstop_msg 
Show all endstops on LCD in checkHitEndstops
 2016-04-16 21:32:25 -07:00
Scott Lahteine
7aaff371b0 Set version for RCBugFix 2016-04-16 21:30:52 -07:00
Scott Lahteine
db86aaf385 Merge pull request #3528 from thinkyhead/rc_fix_bed_level_equation_oopsie 
Fix borked set_bed_level_equation_lsq
 2016-04-16 21:01:06 -07:00
Scott Lahteine
837df6108c Fix borked set_bed_level_equation_lsq 2016-04-16 20:35:42 -07:00
Scott Lahteine
7c16e774ca Show all endstops on LCD in checkHitEndstops 2016-04-16 20:08:42 -07:00
Scott Lahteine
40050db210 Improve code in Sd2Card::readBlock 2016-04-16 20:03:39 -07:00
Scott Lahteine
8429ae6beb Merge pull request #3525 from thinkyhead/rc_fix_pid_params_per_extruder 
Fix broken PID_PARAMS_PER_EXTRUDER
 2016-04-16 19:49:42 -07:00
Scott Lahteine
339b5b3e34 Patch more configs with new changes 2016-04-16 19:35:02 -07:00
Scott Lahteine
ef2fd620e9 Suggested fixups for LCD/SD config comments 2016-04-16 19:35:02 -07:00
João Brázio
7b5d6ba315 Rebase & feedback 2016-04-16 19:35:02 -07:00
João Brázio
d7cc2c0847 Moved some conditionals to Conditionals.h 2016-04-16 19:32:41 -07:00
João Brázio
36a49eab1c Improved the LCD and SD comments blocks in Configuration.h 2016-04-16 19:32:41 -07:00
Scott Lahteine
d4a848c72a Fix broken PID_PARAMS_PER_EXTRUDER 
As noted by @FalloutBe in #3519
 2016-04-16 19:19:40 -07:00
Scott Lahteine
0fc84b75f4 Merge pull request #3522 from esenapaj/patch-1 
Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)
 2016-04-16 19:03:27 -07:00
Scott Lahteine
4b75b11a53 Wrap defines in parentheses in configs, M48 2016-04-16 18:21:09 -07:00
esenapaj
832e1c1f2a Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking) 
・Add more "UL" suffix
・Restore removed "UL" suffix
 2016-04-17 07:50:02 +09:00
Scott Lahteine
234987ee2f Fix MBL lift 2016-04-16 14:17:06 -07:00
Scott Lahteine
e0830bf8f1 Don't use LCD alert unless error or alert level is reset later 2016-04-15 18:48:49 -07:00
Scott Lahteine
773229b020 Merge pull request #3515 from thinkyhead/rc_wider_splash 
On wider screens show a wider splash page, if possible
 2016-04-15 17:26:01 -07:00
Scott Lahteine
86467c24be On wider screens show a wider splash page, if possible 2016-04-15 16:42:29 -07:00
Scott Lahteine
a8e4d7c135 Merge pull request #3477 from alephobjects/BedTempHysteresis 
Implementation of M190 bed temp hysteresis
 2016-04-15 16:20:58 -07:00
esenapaj
5ecd75eeb3 Fix for PR #3502(General cleanup of arc code) 2016-04-16 07:22:07 +09:00
gralco
8ec8d59df8 Use #if TEMP_RESIDENCY_TIME > 0 rather than #ifdef TEMP_RESIDENCY_TIME 2016-04-15 11:20:32 -06:00
Scott Lahteine
1cc622b167 Fix minor spelling in comments 2016-04-14 20:06:59 -07:00
Scott Lahteine
866c5be395 Merge pull request #3500 from thinkyhead/rc_shrink_menu_macros 
Reduce redundancy in MENU_ITEM code
 2016-04-14 19:09:14 -07:00
Scott Lahteine
6e52b0b723 Merge pull request #3504 from thinkyhead/rc_fix_debugging 
Fix debugging of vector_3
 2016-04-14 19:08:30 -07:00
Scott Lahteine
88367a37f7 Merge pull request #3227 from thinkyhead/rc_home_offsets_and_limits 
Relating current_position, min_pos, max_pos, and home_offset
 2016-04-14 18:50:43 -07:00
Scott Lahteine
b20bf1826d Fix debugging of vector_3 2016-04-14 18:45:26 -07:00
Scott Lahteine
4fb8013be1 Reduce redundancy in MENU_ITEM code 2016-04-14 18:42:06 -07:00
Scott Lahteine
b243844690 Merge pull request #3502 from thinkyhead/rc_fix_arcs_bugs 
General cleanup of arc code
 2016-04-14 18:19:44 -07:00
Scott Lahteine
f2abfd6d48 Merge pull request #3501 from thinkyhead/rc_config_comment_cleanup 
Update some comments in Configuration.h
 2016-04-14 18:19:29 -07:00
Scott Lahteine
2129db581e Simplify MBL movement, zigzag 2016-04-14 16:58:42 -07:00
Scott Lahteine
0493fccc0b mbl.active is a bool now 2016-04-14 16:58:42 -07:00
Scott Lahteine
b05f448317 Comments on MBL menu items 2016-04-14 16:58:42 -07:00
Scott Lahteine
e08dd0d831 Merge pull request #3498 from thinkyhead/rc_preheat_abs_both_3489 
Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123
 2016-04-14 16:57:38 -07:00
Scott Lahteine
9e95f30de0 Merge pull request #3495 from jbrazio/bugfix/followup-3485 
Throw an error if ENCODER_PULSES_PER_STEP < -1
 2016-04-14 16:56:36 -07:00
Scott Lahteine
8e5099fa0c Update software endstop positions with M206, M428, G92, etc. 2016-04-14 16:47:22 -07:00
Scott Lahteine
5cfb2533d6 Initial cleaning up of arc code 2016-04-14 16:43:49 -07:00
Scott Lahteine
de8c0baf8b Update some comments in Configuration.h 2016-04-14 16:41:20 -07:00
Scott Lahteine
fda8f96f00 Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123 
Trying to preheat a non-existent extruder causes a crash.
 2016-04-14 15:48:43 -07:00
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