Scott Lahteine
d3ba878f70
Drop intermediate float in HEATER_0_USES_MAX6675 test
2016-08-08 22:49:22 -07:00
Scott Lahteine
3e8f9ecd1c
Extend min/max_temp_error for the bed
2016-08-08 22:49:21 -07:00
Scott Lahteine
1f15f0df5f
Merge pull request #4572 from thinkyhead/rc_digital_clock_100h
...
Show up to 99:59 in digital time
2016-08-08 22:28:29 -07:00
Scott Lahteine
8100a4dace
Fix a compile error in EMERGENCY_PARSER sanity check
2016-08-08 21:49:57 -07:00
Scott Lahteine
45f67164b6
Simplify the delay in kill()
2016-08-08 21:49:34 -07:00
Scott Lahteine
30b1c731b5
Show up to 99:59 in digital time
2016-08-08 21:26:34 -07:00
Scott Lahteine
3be4511230
Patch command order in delta calibration menu
2016-08-08 21:15:25 -07:00
Scott Lahteine
9afa060ed6
Merge pull request #4570 from thinkyhead/rc_proper_delta_calibration
...
Make DELTA_CALIBRATION_MENU more universal
2016-08-08 21:11:40 -07:00
Scott Lahteine
46c8862635
Merge pull request #4564 from AnHardt/max-spi-setup
...
MISO is an input
2016-08-08 21:01:15 -07:00
Scott Lahteine
88540d8ecf
Fix: LCD displays SD status at startup
2016-08-08 20:53:18 -07:00
Scott Lahteine
b16ea09498
Make DELTA_CALIBRATION_MENU more universal
2016-08-08 20:42:58 -07:00
Scott Lahteine
3a56836ead
Always disable SLOWDOWN for DELTA/SCARA
2016-08-08 18:06:46 -07:00
AnHardt
aa9b52b2e7
MISO is an input
2016-08-08 20:09:57 +02:00
Scott Lahteine
67c4acf750
Merge pull request #4562 from thinkyhead/rc_fix_z_dual_endstops
...
Fix Z_DUAL_ENDSTOPS with Z MIN Homing
2016-08-07 19:23:09 -07:00
Scott Lahteine
e113740fa3
Specify that Z_PROBE_*_HEIGHT is nozzle-relative
2016-08-07 17:54:17 -07:00
Scott Lahteine
462e189edd
Move pullups after Z_DUAL_ENDSTOPS block
2016-08-07 17:43:02 -07:00
Scott Lahteine
367dad5902
Sanity check Z_DUAL_ENDSTOPS with DELTA
2016-08-07 17:08:41 -07:00
Scott Lahteine
5fca110e0d
Fix Z_DUAL_ENDSTOPS with MIN homing
2016-08-07 17:08:41 -07:00
Scott Lahteine
fc11f05c11
Merge pull request #4556 from thinkyhead/rc_all_feedrates_mm_s
...
Within Marlin, maintain most feed rates in mm/s
2016-08-07 16:14:16 -07:00
Scott Lahteine
7b2abe6fc8
Use steps_to_mm in extruder runout prevent
2016-08-07 00:28:52 -07:00
Scott Lahteine
d320065320
Within Marlin, maintain most feed rates in mm/s
2016-08-07 00:28:52 -07:00
Scott Lahteine
ed0b50ebee
Merge pull request #4555 from thinkyhead/rc_mbl_index_rounding
...
Remove premature int-cast from MBL cell index methods
2016-08-06 23:34:01 -07:00
Scott Lahteine
bad286d52f
Save CPU by multiplying by pre-compiled values
2016-08-06 23:24:07 -07:00
Scott Lahteine
dce6026e0e
Remove premature cast to int
2016-08-06 23:01:29 -07:00
Scott Lahteine
cffe77c537
Merge pull request #4553 from thinkyhead/rc_lcd_chars_save_ram
...
Save bytes for custom chars (Hitachi LCD)
2016-08-06 18:29:16 -07:00
Scott Lahteine
42927530fe
Explicitly clear the screen in lcd_goto_screen
2016-08-06 18:10:39 -07:00
Scott Lahteine
a6d2c2479f
Minor cleanup of lcd_goto_screen calls
2016-08-06 18:10:39 -07:00
Scott Lahteine
e47c8b9829
Save bytes for custom chars (Hitachi LCD)
2016-08-06 18:10:39 -07:00
Scott Lahteine
0ff5005c9b
Allow connector flexibility for BQ ZUM Mega
2016-08-06 17:19:12 -07:00
Scott Lahteine
98437bd488
Allow override of CONTROLLERFAN_PIN with RAMPS EFF
2016-08-06 17:19:12 -07:00
Scott Lahteine
93eafa1785
Use DISABLED to check TEENSY pin option
2016-08-06 17:19:12 -07:00
AnHardt
98392abb78
Clean warnings for pins_BQ_ZUM_MEGA_3D.h
2016-08-06 17:19:12 -07:00
AnHardt
98e96feee9
Repair SPI-pins
...
SCK_PIN can't be defined as DIO[number] they mus be defined as pure number.
So rebuilding the structure of fastio.h in pins.h.
2016-08-06 17:19:11 -07:00
Scott Lahteine
a00783c41f
Format probe stowed test code
2016-08-06 14:31:07 -07:00
AnHardt
f37e8a31d7
Make Allen Key Probe stow
...
by switching off the tests for the probe before the stow move.
2016-08-06 14:30:38 -07:00
Scott Lahteine
5347f39fce
Merge pull request #4542 from AnHardt/rep-de
...
Repair-language.de
2016-08-05 23:50:35 -07:00
Scott Lahteine
5ef4a5577c
Merge pull request #4537 from thinkyhead/rc_fix_some_flaws
...
Patch up some flaws here and there
2016-08-05 23:49:57 -07:00
AnHardt
0d3b67a580
Repair-language.de
2016-08-06 01:00:40 +02:00
Scott Lahteine
938e6d15c4
Patch up some flaws, here and there
2016-08-05 08:17:37 -07:00
Scott Lahteine
3a3984e67a
Merge pull request #4535 from thinkyhead/rc_old_symbols_first
...
Move tests for old symbols to the top of sanity check
2016-08-04 21:24:02 -07:00
Scott Lahteine
d7b882e430
Move tests for old symbols to the top of sanity check
2016-08-04 21:03:55 -07:00
Scott Lahteine
479107d04f
Merge pull request #4530 from Kaibob2/patch-1
...
Added / Update language_de.h
2016-08-04 16:58:50 -07:00
Kaibob2
1abd7fa670
Update language_de.h
...
Added german translation for MSG_INFO_PRINT_LONGEST and MSG_INFO_PRINT_FILAMENT.
MSG_HEATING_COMPLETE changed from "Aufgeheizt" to "Extr. aufgeheizt"
MSG_HEATING changed from "Aufheizen" to "Extr. aufheizen"
2016-08-04 09:40:38 +02:00
Scott Lahteine
7e2bd9a233
Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT
2016-08-03 21:18:38 -07:00
Scott Lahteine
445458c221
Don't include zprobe_zoffset
in do_probe_raise
2016-08-03 21:12:02 -07:00
Rafa Couto
0114676953
Update of Galician language 2016-08-03
2016-08-03 15:00:18 +02:00
Scott Lahteine
bd7a96ed42
Merge pull request #4517 from thinkyhead/rc_min_probe_pin
...
Define Z_MIN_PROBE_PIN always, allowing override
2016-08-02 21:35:59 -07:00
Scott Lahteine
704ae1b737
Merge pull request #4516 from thinkyhead/rc_short_prints_quiet
...
Only report finished prints longer than 1 min
2016-08-02 21:14:30 -07:00
Scott Lahteine
7ed70305df
Merge pull request #4515 from thinkyhead/rc_fix_speaker_tone
...
Prevent the 'tone(f,d)' function from being interrupted
2016-08-02 21:13:47 -07:00
Scott Lahteine
f1be87a85c
Move probe pin sanity checks out of ABL block
2016-08-02 20:55:17 -07:00
Scott Lahteine
9cb596e88c
Define Z_MIN_PROBE_PIN always, allowing override
2016-08-02 20:31:44 -07:00
Scott Lahteine
229f70f194
Only report finished prints longer than 1 min
2016-08-02 19:58:12 -07:00
Scott Lahteine
e040e00ae9
Merge pull request #4514 from thinkyhead/rc_cleanup_circularqueue
...
Patch up CircularQueue
2016-08-02 19:42:38 -07:00
Scott Lahteine
6110d57c16
Prevent the 'tone(f,d)' function from being interrupted
2016-08-02 19:37:47 -07:00
Scott Lahteine
b73203a0b7
Move some includes around to uncover missing deps
2016-08-02 19:37:46 -07:00
Scott Lahteine
f26d5425bf
Patch up CircularQueue
...
- Use `size` and `count` instead of `length` and `size`
- Fix bug: `peek` should return the item
- Clean up comments, spacing, spelling
2016-08-02 18:57:15 -07:00
Scott Lahteine
c9123adc59
Improved SCREEN / MENU macros
2016-08-02 18:05:34 -07:00
Scott Lahteine
cebeb48005
Merge pull request #4511 from thinkyhead/rc_encoder_flex
...
Allow encoder pulse/step override for more LCDs
2016-08-02 16:50:50 -07:00
Scott Lahteine
3cccaa9885
Allow encoder pulse/step override for more LCDs
2016-08-02 15:57:26 -07:00
Scott Lahteine
14c5a46ee9
Use multiplication for MMM_SCALED
2016-08-02 15:05:17 -07:00
Scott Lahteine
d8945e8464
Fix Z_HEAD index for COREYZ
2016-08-02 15:05:17 -07:00
Scott Lahteine
0f030aface
Merge pull request #4503 from AnHardt/fix-retract
...
Correct typo in retract()
2016-08-02 15:04:55 -07:00
Scott Lahteine
fbd8f06951
Merge pull request #4506 from thinkyhead/rc_buzzer_needs_beeper
...
Buzzer requires BEEPER_PIN
2016-08-02 14:40:43 -07:00
Scott Lahteine
330f82971b
Buzzer requires BEEPER_PIN
2016-08-02 14:05:37 -07:00
Scott Lahteine
e0d7b8bf27
Fix Azteeg X3 servo pin / Viki i2c
2016-08-02 14:05:37 -07:00
Scott Lahteine
7cceb15925
Merge pull request #4505 from thinkyhead/rc_auto_select_dplugs
...
Auto-select power plugs for RAMPS derivatives
2016-08-02 12:56:52 -07:00
Scott Lahteine
593b37519a
Boards with 4 power outputs are EFBF or EFBE
2016-08-02 12:34:28 -07:00
AnHardt
9ab94bd2c1
fix-babysrepping
2016-08-02 21:06:42 +02:00
AnHardt
39c4603598
Correct typo in retract.
2016-08-02 21:06:08 +02:00
Scott Lahteine
cebd2bfff0
Auto-select power plugs for RAMPS derivatives
2016-08-02 11:59:25 -07:00
Scott Lahteine
34c60f1b55
Merge pull request #4491 from thinkyhead/rc_fix_lcd_move_e
...
Use a default argument in _lcd_move_e
2016-08-01 16:45:25 -07:00
Scott Lahteine
38af251b91
Use a default argument in _lcd_move_e
2016-08-01 16:09:26 -07:00
Scott Lahteine
374ae6c099
Fix pins for RAMBO plus VIKI
2016-08-01 16:09:26 -07:00
Scott Lahteine
7594138740
Merge pull request #4493 from jbrazio/buildroot-cleanup
...
Move font folder
2016-08-01 15:57:23 -07:00
Scott Lahteine
6eed37aafb
Merge pull request #4486 from thinkyhead/rc_pid_add_extrusion_rate_off
...
PID_EXTRUSION_SCALING, disabled by default
2016-07-31 18:23:51 -07:00
Scott Lahteine
4bf3526d00
Merge pull request #4463 from thinkyhead/rc_azteeg_x3_eeb
...
Wrangle RAMPS variants and derivatives
2016-07-31 18:22:49 -07:00
Scott Lahteine
1993c45759
Merge pull request #4487 from thinkyhead/rc_refresh_pos_fix
...
Update refresh_positioning - no need for obj ref
2016-07-31 18:22:38 -07:00
Scott Lahteine
f83369b79c
Update refresh_positioning - no need for obj ref
2016-07-31 18:01:13 -07:00
Scott Lahteine
63fd1f49a6
PID_EXTRUSION_SCALING, disabled by default
2016-07-31 17:49:34 -07:00
Scott Lahteine
49997e2e22
HI_VOLT_PIN => "RAMPS_Dn_PIN"
2016-07-31 15:42:52 -07:00
AnHardt
60ad365e21
repair-software-spi
2016-07-31 15:50:42 +02:00
Scott Lahteine
f388beafa1
Merge pull request #4476 from otvald/RCBugFix
...
FIX for endstop adjustemt on delta is offset
2016-07-31 01:09:54 -07:00
Scott Lahteine
3633d4978b
Merge pull request #4475 from esenapaj/Fix-for-PR-#4452
...
Fix for PR #4452 (Additional heater-state output changes)
2016-07-31 01:08:27 -07:00
Thomas Otvald Jensen
fe059f1221
During homing, line_to_axis_pos will make a path which moves across the
...
endstop trigger point. The move is stopped at endstop, so current_position
should also be adjusted to reflect this!
Caused error in subsequent call in endstop adjustment, since the movement
would assume a wrong starting position.
2016-07-30 16:50:31 +02:00
esenapaj
bd73e6d3c8
Fix for PR #4452 (Additional heater-state output changes)
...
・Add missing ';'
2016-07-30 22:49:30 +09:00
esenapaj
cd5b03d88f
Update distribution date and readme
2016-07-30 21:27:29 +09:00
Scott Lahteine
f575e92f2e
Merge pull request #4473 from esenapaj/Follow-up-the-PR-#4408-etc
...
Follow-up the PR #4408 (Add support for reprapworld LCD), etc
2016-07-30 04:45:27 -07:00
esenapaj
657ef8aded
Follow-up the PR #4408 (Add support for reprapworld LCD), etc
...
・Put #define REPRAPWORLD_GRAPHICAL_LCD into all the example
configuration files
・Adjust spacing
2016-07-30 20:32:57 +09:00
Scott Lahteine
83d341c394
Make Conditionals.h a catch-all for old configs
2016-07-30 04:25:30 -07:00
Scott Lahteine
de951c64f1
Make pins for EFF a consistent order
2016-07-30 04:17:21 -07:00
Scott Lahteine
49f75b7891
pins_RAMPS_14.h => pins_RAMPS.h
2016-07-30 04:17:21 -07:00
Scott Lahteine
d3b713cebc
Set flags for RAMPS "type" in pins.h
2016-07-30 04:17:21 -07:00
Scott Lahteine
223b7e473f
RAMPS assignment for derivatives
2016-07-30 04:17:21 -07:00
Scott Lahteine
3865843283
Consolidate setting of RAMPS High Voltage PWM outputs
2016-07-30 04:17:21 -07:00
Scott Lahteine
bdac2eb13a
Don't set non-existent SLED_PIN
2016-07-30 04:17:21 -07:00
Scott Lahteine
bfbd01e29a
Merge pull request #4470 from thinkyhead/rc_fix_manual_move
...
Followup to #4468
2016-07-30 04:17:05 -07:00
Scott Lahteine
802d873fc1
Merge pull request #4469 from esenapaj/Fix-for-PR-#4453
...
Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS)
2016-07-30 04:08:54 -07:00
Scott Lahteine
8e2f095dde
Merge pull request #4456 from jbrazio/speaker-type3
...
Improvement to non-blocking speaker
2016-07-30 04:07:08 -07:00
Scott Lahteine
ad68b4cb8b
Followup to #4468
2016-07-30 03:49:42 -07:00
esenapaj
b8c112c490
Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS)
2016-07-30 19:37:43 +09:00
Scott Lahteine
2f76138645
Merge pull request #4468 from thinkyhead/rc_fix_manual_move
...
Specify manual-movable E axes by extruder type
2016-07-30 03:21:43 -07:00
Scott Lahteine
696b63e300
Specify manual-movable E axes by extruder type
2016-07-30 00:36:48 -07:00
Scott Lahteine
46c33f1cfa
Merge pull request #4467 from jbrazio/safe_delay-millis_t
...
Makes safe_delay() to be fully compatible with delay()
2016-07-29 20:23:44 -07:00
Scott Lahteine
9e21b2e51d
Merge pull request #4455 from AnHardt/double-bump-feature
...
double bump probing as a feature
2016-07-29 20:00:10 -07:00
Scott Lahteine
db4d03bc81
Merge pull request #4452 from thinkyhead/rc_fix_heaterstates_part_2
...
Additional heater-state output changes
2016-07-29 19:58:00 -07:00
Scott Lahteine
c68ca95345
Merge pull request #4464 from thinkyhead/rc_fix_steps_per_mm_handling
...
Account for DELTA in Planner::refresh_positioning
2016-07-29 19:34:59 -07:00
João Brázio
226e74a438
Fixes safe_delay() to be fully compatible with delay()
2016-07-30 02:56:26 +01:00
João Brázio
8e79e8cdb3
Adds types.h
2016-07-30 02:55:52 +01:00
Scott Lahteine
844a4e799e
Account for DELTA in Planner::refresh_positioning
2016-07-29 18:41:11 -07:00
AnHardt
7188ce0ad6
double bump probing as a feature
...
Why double touch probing is not a good thing.
It's widely believed we can get better __probing__ results when using a double touch when probing.
Let's compare to double touch __homing__.
Or better let's begin with single touch __homing__.
We home to find out out position, so our position is unknown.
To find the endstop we have to move into the direction of the endstop.
The maximum way we have to move is a bit longer than the axis length.
When we arrive at the endstop - when it triggers, the stepper pulses are stopped immediately.
It's a sudden stop. No smooth deacceleration is possible.
Depending on the speed and the moving mass we lose steps here.
Only if we approached slow enough (below jerk speed?) we will not lose steps.
Moving a complete axis length, that slow, takes for ever.
To speed up homing, we now make the first approach faster, get a guess about our position,
back up a bit and make a second slower approach to get a exact result without losing steps.
What we do in double touch probing is the same. But the difference here is:
a. we already know where we are
b. if the first approach is to fast we will lose steps here to.
But this time there is no second approach to set the position to 0. We are measuring only.
The lost steps are permanent until we home the next time.
So if you experienced permanently rising values in M48 you now know why. (Too fast, suddenly stopped, first approach)
What can we do to improve probing?
We can use the information about our current position.
We can make a really fast, but deaccelerated, move to a place we know it is a bit before the trigger point.
And then move the rest of the way really slow.
2016-07-30 03:00:49 +02:00
Scott Lahteine
c31f56a38c
Deprecate EXTRUDER_WATTS and BED_WATTS
2016-07-29 17:34:14 -07:00
Scott Lahteine
e1970b4b28
Show power output in same order as temp output
2016-07-29 14:55:22 -07:00
Scott Lahteine
74df828acc
Show ADC values inline rather than after
2016-07-29 14:55:18 -07:00
João Brázio
2b5faa61e2
Consolidates Buzzer and Speaker into a single object
2016-07-29 19:25:39 +01:00
João Brázio
8093c5f534
Non-blocking speaker now uses arduino's tone()
2016-07-29 18:45:50 +01:00
João Brázio
8896f08074
Fixes a compilation error introduced by #4448
2016-07-29 18:33:42 +01:00
Scott Lahteine
ea5ac94804
Improved MANUAL_[XYZ]_HOME_POS
...
No need for `MANUAL_HOME_POSITIONS`. Just set each one as-needed to
override the automatic behavior.
2016-07-28 19:51:48 -07:00
Scott Lahteine
b40661cb18
Fix output of heater states
2016-07-28 17:40:01 -07:00
Scott Lahteine
9083e5420a
Merge pull request #4419 from AnHardt/sd2pinmap
...
Switch Sd2CardLib to fastio
2016-07-28 17:38:46 -07:00
Scott Lahteine
6f59560526
Merge pull request #4448 from jbrazio/speaker-followup
...
A little cleanup at speaker.h
2016-07-28 17:37:36 -07:00
Scott Lahteine
c94b6dd3e7
Revert to SanityCheck on every .cpp file
2016-07-28 17:17:50 -07:00
Scott Lahteine
256b03598d
Merge pull request #4450 from thinkyhead/rc_fix_delta_optimization
...
Fix DELTA speed calculation
2016-07-28 16:50:04 -07:00
Scott Lahteine
753283e020
inverse_second => inverse_mm_s
2016-07-28 16:35:18 -07:00
Scott Lahteine
83e1d90ca3
Undo errant optimization of block->millimeters
2016-07-28 16:26:52 -07:00
João Brázio
909e98b1af
A little cleanup at speaker.h
2016-07-29 00:03:25 +01:00
Scott Lahteine
ae1c7bca1b
Merge pull request #4445 from thinkyhead/rc_fix_rdfgsc_mega3
...
Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
2016-07-28 15:55:30 -07:00
Scott Lahteine
03fdb26cd2
Wrangle encoder bits, LCD_CLICKED
2016-07-28 14:44:37 -07:00
Scott Lahteine
155def24c6
BLEN_A, B, C are defined in ultralcd headers
2016-07-28 14:38:50 -07:00
Scott Lahteine
42dcc3bf50
Remove "the click" comments
2016-07-28 14:38:50 -07:00
Scott Lahteine
0eba65f96b
Fix for R.D.F.G.S.C. with MINITRONICS board
2016-07-28 14:38:50 -07:00
fabtopia
83d0d59303
Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
...
The support for reprapworld LCD boke the code for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER. See Full Grapics Display does not work any more after #4408 #4439
2016-07-28 13:12:19 -07:00
João Brázio
4f191a384b
Moves the font folder into the buildroot
2016-07-28 19:56:41 +01:00
Scott Lahteine
5367d56f87
Merge pull request #4434 from thinkyhead/rc_delta_safe_homing
...
DELTA should ignore Z_SAFE_HOMING
2016-07-27 23:41:52 -07:00
Scott Lahteine
2525528fb2
DELTA should ignore Z_SAFE_HOMING
2016-07-27 23:25:56 -07:00
Scott Lahteine
ab4b2a66ff
Allow zero Z_RAISE_BETWEEN_PROBINGS
2016-07-27 05:00:58 -07:00
Scott Lahteine
8953e3e984
Allow Z_SAFE_HOMING without a probe
2016-07-27 04:33:56 -07:00
AnHardt
e4942d2163
Switch SD2cadrLib to fastio
...
Replace all fastDigitalRead/Write() with READ/WRITE()
Define SCK_PIN, MISO_PIN, MOSI_PIN in pins.h if not already defined in the pins_*.h files.
Remove these conditional pin definitions from the pin-files. They are now always defined.
Define separate sets of SPI-pins for AT90USB with and without Teensy support in fastio.h.
Likely this was the main reason for all that confusion about the AT90USB-SPI pins.
2016-07-27 12:40:44 +02:00
Scott Lahteine
21e744c454
Allow zero raise for deploy/stow
2016-07-26 17:19:25 -07:00
Scott Lahteine
54084612fd
Merge pull request #4415 from petrzjunior/transl
...
[LANGUAGE] Update Czech (Info screen strings)
2016-07-26 13:20:20 -07:00
Scott Lahteine
5597400cda
Merge pull request #4414 from thinkyhead/rc_split_conditionals
...
Split up Conditionals.h into two files
2016-07-26 13:16:52 -07:00
Scott Lahteine
4be635ec6e
Remove MSG_PRINT_TIME from languages
2016-07-26 12:47:45 -07:00
Scott Lahteine
3be49881c0
Make SanityCheck.h a catch-all for obsolete configs
2016-07-26 12:41:40 -07:00
Scott Lahteine
fa647cca23
Do the sanity check just once per build
2016-07-26 12:37:14 -07:00
Scott Lahteine
24a1a16e5d
Move versioning to MarlinConfig.h
2016-07-26 12:37:14 -07:00
Scott Lahteine
7e70a0b05d
Move pins / Arduino includes to MarlinConfig.h
2016-07-26 12:37:14 -07:00
Scott Lahteine
d9f7ed9a3c
Move some macros from Marlin.h to macros.h
2016-07-26 12:37:13 -07:00
Scott Lahteine
277899c175
Move include _Bootscreen.h where needed
2016-07-26 12:37:13 -07:00
Scott Lahteine
83c4653c71
Include boards and macros ahead of configs
2016-07-26 12:19:50 -07:00
Scott Lahteine
5f4702ecb2
Make Conditionals.h a catch-all for old configs
2016-07-26 12:19:50 -07:00
Scott Lahteine
8a44928df3
Make Conditionals.h a catch-all for old configs
2016-07-26 12:19:50 -07:00
Petr Zahradník junior
3d9b878cf0
Czech update
2016-07-26 13:48:27 +02:00
Scott Lahteine
c6226bb0aa
Unify config in a single include without nested includes
2016-07-25 23:04:19 -07:00
Scott Lahteine
2d378fac1b
No need to include thermistortables.h in Configuration.h
2016-07-25 22:43:50 -07:00
Scott Lahteine
df27d01cd9
Arrange needed includes in Marlin.h
2016-07-25 20:53:36 -07:00
Scott Lahteine
93ea281061
Split up Conditionals.h into two files
...
Rather than include twice, which is tricky but may confuse
2016-07-25 20:30:45 -07:00
Scott Lahteine
8684570f68
Merge pull request #4412 from thinkyhead/rc_followup_4402
...
Followup #4402 fixing 3-point leveling
2016-07-25 16:10:50 -07:00
Scott Lahteine
c55b7d0750
Merge pull request #4405 from thinkyhead/rc_theres_always_something
...
Move HAS_DIGIPOTSS to Conditionals.h
2016-07-25 15:58:42 -07:00
Scott Lahteine
42eebcd518
Merge pull request #4409 from thinkyhead/rc_cleanup_comment
...
Clean up Transfer Buffer Size comment
2016-07-25 15:58:34 -07:00
Scott Lahteine
5272147f7c
Followup #4402 fixing 3-point leveling
2016-07-25 15:56:34 -07:00
Scott Lahteine
fcc39e2b5f
Clean up Transfer Buffer Size comment
2016-07-25 12:54:55 -07:00
Scott Lahteine
0c0a63322b
Patches to prepare REPRAPWORLD_GRAPHICAL_LCD
2016-07-25 12:10:25 -07:00
brupje
a60a668f6b
Support for REPRAPWORLD_GRAPHICAL_LCD
2016-07-25 12:10:25 -07:00
Scott Lahteine
4f2ff46ab9
Move HAS_DIGIPOTSS to conditionals
2016-07-25 00:10:46 -07:00
Scott Lahteine
54f4f80077
Merge pull request #4404 from thinkyhead/rc_better_stepper_indirection
...
Arrange stepper_indirection by axis
2016-07-24 19:26:39 -07:00
Scott Lahteine
169c21b477
Merge pull request #4402 from thinkyhead/rc_consistent_positioning
...
Account for coordinate space offsets
2016-07-24 19:23:20 -07:00
Scott Lahteine
750a1e5116
Arrange stepper_indirection by axis
2016-07-24 19:00:51 -07:00
Scott Lahteine
7c27f34996
Merge pull request #4397 from thinkyhead/rc_tweak_eeprom
...
Neaten up EEPROM read/write functions
2016-07-24 18:45:54 -07:00
Scott Lahteine
2595a40a61
Account for coordinate space more in G28 / G29 / M48
2016-07-24 18:34:05 -07:00
Scott Lahteine
060dc6d95a
Neaten up EEPROM read/write functions
2016-07-24 18:19:39 -07:00
Scott Lahteine
b7b7c90477
Merge pull request #4389 from thinkyhead/rc_optimize_planner
...
Optimize planner with precalculation, etc.
2016-07-24 17:48:23 -07:00
Scott Lahteine
6900bb2286
Merge pull request #4395 from tnw513/italian_fix
...
Update Italian translations. Remove trailing spaces.
2016-07-24 17:47:48 -07:00
Scott Lahteine
e4816293a8
serial_echopair_P for uint16_t
2016-07-24 17:46:37 -07:00
Scott Lahteine
d8e5af6834
Use RAW_POSITION for MBL in planner.set_position_mm
2016-07-24 17:20:36 -07:00
Scott Lahteine
b183442c61
Fix inactive_extruder_x_pos for coordinate space
2016-07-24 17:20:36 -07:00
Scott Lahteine
f75b0c2ee1
Make POSITION macros global
2016-07-24 17:20:36 -07:00
Scott Lahteine
101b60ef42
Tweak Dual X Carriage data spacing
2016-07-24 17:20:35 -07:00
Scott Lahteine
1fe60b723f
Merge pull request #4400 from thinkyhead/rc_sanity_check_temp_sensor
...
Sanity check for too many temp sensors
2016-07-24 15:38:41 -07:00
Scott Lahteine
bedda3be61
Patch generic delta error caught by sanity check
2016-07-24 15:24:40 -07:00
Scott Lahteine
a5212bf277
Sanity check for too many temp sensors
2016-07-24 13:47:27 -07:00
Scott Lahteine
d8f2876753
Replace some float division with multiplication
2016-07-24 13:27:50 -07:00
Scott Lahteine
ddde785b37
Code formatting in planner.cpp
2016-07-24 13:27:50 -07:00
Scott Lahteine
f8b5749235
Replace division in planner with multiplication
2016-07-24 13:27:49 -07:00
Scott Lahteine
b921f6b69d
Optimize calculation of block->millimeters for DELTA
2016-07-24 13:27:49 -07:00
Scott Lahteine
db5df9500b
Move sync_plan_position closer to the top
2016-07-24 13:27:49 -07:00
Scott Lahteine
2839c56f5a
Merge pull request #4390 from jbrazio/duration_t
...
Renamed timestamp_t to duration_t
2016-07-24 13:24:05 -07:00
Scott Lahteine
d6c50671d3
Sanitycheck: Z_SAFE_HOMING points are reachable
2016-07-24 10:54:47 -07:00
Scott Lahteine
a6203366b6
Sanitycheck: Z_SAFE_HOMING requires a probe
2016-07-24 10:54:25 -07:00
Scott Lahteine
bbe5b80492
Always define probe limits if there is a probe
2016-07-24 10:53:58 -07:00
Silvio Didonna
950397f2a0
Added missing translations. Removed trailing spaces for consistency ( #4376 )
2016-07-24 17:22:30 +02:00
João Brázio
50fb0f7cec
M31 serial output is now always in EN
2016-07-24 15:52:03 +01:00
João Brázio
62d96d72f3
Renamed timestamp_t to duration_t
2016-07-24 03:16:02 +01:00
Scott Lahteine
3e2b3353b0
Fix axis indices for COREYZ
2016-07-23 19:02:14 -07:00
Scott Lahteine
c287846f46
Merge pull request #4387 from thinkyhead/rc_anhardt_more_4370
...
Update Z in a unified way in run_z_probe
2016-07-23 16:47:10 -07:00
Scott Lahteine
22d0654fe6
Merge pull request #4382 from esenapaj/Update-Japanese-translation
...
Update Japanese translation
2016-07-23 16:31:38 -07:00
Scott Lahteine
bb93b6822a
Use set_current_from_steppers_for_axis
2016-07-23 15:25:54 -07:00
AnHardt
96a162beda
Use implications from #4370 in run_z_probe()
...
See also https://github.com/MarlinFirmware/Marlin/pull/4370#issuecomment-234713680
2016-07-23 13:09:28 -07:00
Scott Lahteine
4e67a85a5d
Macros to loop over axes
2016-07-23 13:09:28 -07:00
esenapaj
784be56e99
Follow-up the PR #4353 (General cleanup: enum)
...
・Update description of M111
2016-07-24 00:53:35 +09:00
esenapaj
3c11977558
Update Japanese translation
...
・Add translation
・Change translation
・Remove translation
2016-07-23 22:07:20 +09:00
Scott Lahteine
08459a003f
Undo the self-sabotage that is do_blocking_move_to_axis_pos
2016-07-23 00:59:11 -07:00
esenapaj
d32c4056ad
Fix for the PR #4379 (Additional logging of do_blocking_move_to)
...
・Remove unneeded PSTR()
2016-07-23 16:38:57 +09:00
Scott Lahteine
8099ee51a5
Merge pull request #4379 from thinkyhead/rc_blocking_move_logging
...
Additional logging of do_blocking_move_to
2016-07-23 00:10:55 -07:00
Scott Lahteine
8633b644cf
Merge pull request #4378 from thinkyhead/rc_debug_leveling_docs
...
Document DEBUG_LEVELING_FEATURE
2016-07-22 23:57:01 -07:00
Scott Lahteine
ad16d5019e
Additional logging of do_blocking_move_to
2016-07-22 23:53:08 -07:00
Scott Lahteine
bb9da6ebdd
Document DEBUG_LEVELING_FEATURE
2016-07-22 23:37:41 -07:00
Scott Lahteine
652fd8a826
Merge pull request #4362 from thinkyhead/rc_duplication_mode
...
DUAL_NOZZLE_DUPLICATION_MODE
2016-07-22 21:17:59 -07:00
Scott Lahteine
1766b990b8
Merge pull request #4376 from jbrazio/timestamp_t-short
...
Adds short format to timestamp_t
2016-07-22 21:17:17 -07:00
Scott Lahteine
6da3729531
Merge pull request #4370 from thinkyhead/rc_delta_fwd_kinematics
...
Delta Forward Kinematics (and LOGICAL_POSITION)
2016-07-22 21:16:00 -07:00
João Brázio
9e5dbf67e8
Update the stats menu to include longest job and extruded filament
2016-07-23 03:05:45 +01:00
João Brázio
86d9311495
Rework LCD implementation to use timestamp_t
2016-07-23 03:05:36 +01:00
Scott Lahteine
b3eb0c8569
Add LOGICAL_POSITION macro, apply to kinematics
2016-07-22 18:38:13 -07:00
Scott Lahteine
35a610abf9
const arg to inverse_kinematics
2016-07-22 17:42:48 -07:00
João Brázio
b4aad85c9a
Rework stats menu to use timestamp_t
2016-07-23 01:42:21 +01:00
João Brázio
ecd48027fa
Adds short timestamp format to timestamp_t
2016-07-23 01:41:25 +01:00
Scott Lahteine
b6afa028f4
Don't call adjust_delta on SCARA
2016-07-22 16:36:34 -07:00
Scott Lahteine
d5e2d523c7
Generalize kinematics function names
2016-07-22 16:36:34 -07:00
Scott Lahteine
9c4ad7d7ef
Clean up delta declarations in Marlin_main.cpp
2016-07-22 16:36:33 -07:00
Scott Lahteine
4b1725628b
Move kinematic functions to "private" scope
2016-07-22 16:36:33 -07:00
Scott Lahteine
cde068ea42
Use set_current_from_steppers in quickstop_stepper
2016-07-22 16:36:33 -07:00
Scott Lahteine
9f30cc84ce
Use set_current_from_steppers for other kinematics
2016-07-22 16:36:33 -07:00
AnHardt
5db9b940ee
Use forwardKinematics in DELTA run_z_probe()
2016-07-22 16:36:33 -07:00
Scott Lahteine
b5a9647fec
Use ENABLED
in stepper_indirection.h
2016-07-22 16:26:06 -07:00
Scott Lahteine
cbc7f22ad9
Implement DUAL_NOZZLE_DUPLICATION_MODE
2016-07-22 16:23:58 -07:00
Scott Lahteine
91777dd76c
Add DUAL_NOZZLE_DUPLICATION_MODE option
2016-07-22 16:22:56 -07:00
Scott Lahteine
260bbb3109
Fix a couple of simple typos
2016-07-22 16:22:56 -07:00
Scott Lahteine
179e091473
Merge pull request #4374 from thinkyhead/rc_jbrazio_timestamp_t
...
Implements timestamp_t structure
2016-07-22 16:08:10 -07:00
AnHardt
499e404fbf
forwardKinematics for Delta printers
2016-07-22 16:01:51 -07:00
João Brázio
23043a1e05
Rework some code to use timestamp_t struct (saves 72 bytes)
2016-07-22 15:53:31 -07:00
João Brázio
9388dcfa49
Implements timestamp_t structure
2016-07-22 15:53:31 -07:00
Scott Lahteine
0b2c608d2f
Merge pull request #4372 from jbrazio/gcc-bark
...
Fix minor gcc warning
2016-07-22 15:18:53 -07:00
Scott Lahteine
311c7dadb6
Cleanup do_blocking_move_to for DELTA
2016-07-22 14:18:45 -07:00
Scott Lahteine
b78590e63d
Patch and cleanup run_z_probe
2016-07-22 14:18:45 -07:00
João Brázio
2f7716987d
Fix minor gcc warning
2016-07-22 16:08:56 +01:00
João Brázio
efd3aabda8
Adds missing documentation to the point_t structure
2016-07-22 15:19:20 +01:00
Scott Lahteine
39caef4279
Merge pull request #4361 from AnHardt/imp-dbmt-for-delta
...
DELTA do_blocking_move_to() more like the Chartesian one
2016-07-21 20:05:04 -07:00
Scott Lahteine
7d869ad98b
Merge pull request #4365 from thinkyhead/rc_shrink_planner_accel
...
Adjustments to planner acceleration limit
2016-07-21 18:18:15 -07:00
AnHardt
376a57232e
DELTA do_blocking_move_to() more like the Chartesian one
2016-07-22 03:12:46 +02:00
Scott Lahteine
824c6859e2
Merge pull request #4369 from thinkyhead/rc_no_static_moves
...
inline to fix warnings, smaller build size (sometimes)
2016-07-21 14:46:09 -07:00
Scott Lahteine
976c31235d
inline to fix warnings, smaller build size (sometimes)
2016-07-21 13:49:37 -07:00
AnHardt
6ef26a85d8
Back to the differences method in run_z_probe()
2016-07-21 18:16:38 +02:00
Scott Lahteine
4226f56f53
Revert the planner acceleration logic somewhat
2016-07-20 19:19:47 -07:00
Scott Lahteine
16e5348659
Merge pull request #4360 from thinkyhead/rc_toolchange_for_G28
...
Always switch to tool 0 for G28
2016-07-20 19:07:35 -07:00
Scott Lahteine
209f5c03d0
Fewer temporary vars in planner accel limit
2016-07-20 18:29:29 -07:00
Scott Lahteine
62ecd107ba
Patch ultralcd_impl header conditional names
2016-07-20 09:36:55 -07:00
Scott Lahteine
d2e9a9c188
Always switch to tool 0 for G28
2016-07-20 09:36:55 -07:00
Scott Lahteine
194d9521c3
Merge pull request #4356 from thinkyhead/rc_simpler_run_z_probe
...
Unify run_z_probe
2016-07-19 19:02:39 -07:00
Scott Lahteine
4a6ed5e221
Use HOMING_FEEDRATE_Z for Z_PROBE_SPEED_FAST
2016-07-19 18:42:48 -07:00
AnHardt
09a3cc33e6
Unify run_z_probe
...
Unify run_z_probe
Add double touch for DELTAs.
Introduce Z_PROBE_SPEED_FAST and Z_PROBE_SPEED_SLOW
defaulting to homing_feedrate_mm_m[Z_AXIS] and homing_feedrate_mm_m[Z_AXIS]/2
2016-07-19 18:42:48 -07:00
Scott Lahteine
6137a1d934
Merge pull request #4359 from thinkyhead/rc_wrangle_movement_etc
...
Use ENABLED(MAPPER_NON)
2016-07-19 18:22:55 -07:00
Scott Lahteine
0432613ad7
use enabled macro for mapper setting
2016-07-19 18:08:56 -07:00
Scott Lahteine
e44b37cdc2
motion section marker below homing speeds
2016-07-19 17:31:58 -07:00
Scott Lahteine
204fd6ec44
Set homing feedrates individually
2016-07-19 17:31:58 -07:00
Scott Lahteine
2bad02e60d
Reprapworld Keypad: F1 opens the Move Axis menu
2016-07-19 16:40:39 -07:00
Scott Lahteine
eaa6f568ee
Prevent re-entrant call of Reprapworld Keypad handler
2016-07-19 16:40:39 -07:00
Scott Lahteine
6abf916575
Reprapworld Keypad move step is 1mm
2016-07-19 16:40:39 -07:00
Scott Lahteine
06ac1f3bcf
Reduce Reprapworld Keypad move code size
2016-07-19 16:40:39 -07:00
Scott Lahteine
5d5affdfca
Merge pull request #4355 from thinkyhead/rc_rename_ultralcd_files
...
Rename ultralcd implementation files for consistency
2016-07-19 16:14:27 -07:00
Scott Lahteine
bb225dedc6
Merge pull request #4354 from thinkyhead/rc_jbrazio_rework_g12
...
NOZZLE_CLEAN_FEATURE with no dependency on HAS_BED_PROBE
2016-07-19 15:26:59 -07:00
Scott Lahteine
8a2efd1155
Rename ultralcd implementation files for consistency
2016-07-19 15:26:14 -07:00
João Brázio
b869fbc05e
Update all config files with the new G12 options
2016-07-19 15:07:03 -07:00
João Brázio
47fef80848
Nozzle::clean() no longer requires HAS_BED_PROBE
2016-07-19 15:07:02 -07:00
Scott Lahteine
f1f1bac0e1
Merge pull request #4341 from esenapaj/Update-Japanese-translation
...
Update Japanese translation
2016-07-19 15:04:22 -07:00
Scott Lahteine
6c899bb520
Merge pull request #4349 from jbrazio/gcc-bark-bark
...
Removes some minor GCC warnings
2016-07-19 13:42:33 -07:00
Scott Lahteine
ef0a22871e
Merge pull request #4350 from jbrazio/followup-a875861
...
Adds utility.h
2016-07-19 13:40:52 -07:00
Scott Lahteine
9eba58a031
Merge pull request #4351 from jbrazio/u8glib-converter
...
Updates u8glib's bmp2hex converter
2016-07-19 13:39:33 -07:00
Scott Lahteine
c502018eab
Merge pull request #4353 from jbrazio/global-enum-file
...
General cleanup: enum
2016-07-19 13:37:56 -07:00
Scott Lahteine
0f9953b031
Merge pull request #4342 from AnHardt/rep-cons-g28
...
Introduce line_to_axis_pos() for use in homeaxis()
2016-07-19 12:56:58 -07:00
AnHardt
11c075c6b2
Introduce line_to_axis_pos(axis_codes axis, float where, float feed_rate = 0.0)
...
and use it in `homeaxis()` instead of `do_blocking_move_to_axis_pos()`.
`do_blocking_move_to_axis_pos` was wrong because it performed subdivided, delta-corrected moves for x- and y-axis.
The first common move for delta homing is like quick_home but for 3 towers.
Fix two warnings.
2016-07-19 17:24:44 +02:00
João Brázio
3ebad4e020
Moves all global enums to a central file
2016-07-19 14:31:09 +01:00
João Brázio
238fefcb00
Updates Stopwatch class to use internal state enum
2016-07-19 14:30:44 +01:00
João Brázio
30ac0782a9
Comment section style correction
2016-07-19 03:27:42 +01:00
João Brázio
8ecee431c4
Updates u8glib's bmp2hex converter
2016-07-19 03:16:30 +01:00
João Brázio
79e7721b76
Removes some minor GCC warnings
2016-07-19 03:03:11 +01:00
João Brázio
f4d63796b2
Adds utility.h
2016-07-19 02:55:23 +01:00
esenapaj
361307831e
Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins)
...
・Solve a flickering when SD card is inserted or removed at using a ASCII
LCD + language_kana.h
2016-07-18 20:09:24 +09:00
esenapaj
ff48bbb86a
Update Japanese translation
...
・Add new translation
2016-07-18 17:01:56 +09:00
Scott Lahteine
46117593b9
Merge pull request #4185 from esenapaj/Update-Japanese-translation
...
Update Japanese translation (work in progress)
2016-07-17 18:36:34 -07:00
Scott Lahteine
3422103863
Merge pull request #4310 from thinkyhead/rc_mbl_position_shift
...
Fix position shift with MBL
2016-07-17 18:31:25 -07:00
Scott Lahteine
92757bd7b3
Merge pull request #4339 from esenapaj/Follow-up-the-PR-#4163
...
Follow-up the PR #4163 (Mixing and Switching Extruders)
2016-07-17 18:15:23 -07:00
Scott Lahteine
493d30cd97
Drop intermediate nx, ny, and set destination directly
2016-07-17 17:59:52 -07:00
Scott Lahteine
07a735ad22
We always use destination
so modify mesh_buffer_line
2016-07-17 17:57:33 -07:00
Scott Lahteine
04a5b7b257
A macro to normalize positions
2016-07-17 17:57:32 -07:00
esenapaj
5c8e87a866
Follow-up the PR #4163 (Mixing and Switching Extruders)
...
・Update forgotten K8400 files
2016-07-18 09:48:13 +09:00
Scott Lahteine
86eb5251c5
Fix some debug messages
2016-07-17 17:10:02 -07:00
Scott Lahteine
1e57a6af73
Use blocking_move, current_position in G28 homing
2016-07-17 16:56:13 -07:00
Scott Lahteine
f6a3a1da09
nz and ne are always set, so drop them down
2016-07-17 14:12:39 -07:00
Scott Lahteine
d0009e013b
Rename cell index vars
2016-07-17 14:12:39 -07:00
Scott Lahteine
697373b071
Reduce code size of mesh_buffer_line
2016-07-17 14:11:25 -07:00
Scott Lahteine
103d312f6d
MBL can actually do up to 9 x 9
2016-07-17 14:11:25 -07:00
Scott Lahteine
f4a69281fc
Only call mesh_buffer_line when MBL is active
2016-07-17 14:11:25 -07:00
Scott Lahteine
799a31cd30
Include the position_shift when splitting mesh lines
2016-07-17 14:08:20 -07:00
Scott Lahteine
f242aea032
Merge pull request #4319 from thinkyhead/rc_feedrates_to_mess_with_you
...
Wrangle feed rate variables
2016-07-17 14:07:52 -07:00
Scott Lahteine
0342661b3f
Merge pull request #4335 from thinkyhead/rc_status_pad_jp
...
Debug char, fix compile errors for lcd pins
2016-07-17 14:07:08 -07:00
Scott Lahteine
81e01152bb
Merge pull request #4336 from thinkyhead/rc_bltouch_sensor
...
BLTouch probe sensor
2016-07-17 14:06:32 -07:00
Scott Lahteine
1583177ef4
BLTOUCH probe config option
2016-07-17 13:55:38 -07:00
Scott Lahteine
176b9627c7
Some cleanup ahead of BLTOUCH support
2016-07-17 13:55:38 -07:00
Scott Lahteine
39706f3e57
Endstop invert flags as macros instead of const bool
2016-07-17 13:51:02 -07:00
Scott Lahteine
7242d44810
Endstops vars already initialized
2016-07-17 13:38:48 -07:00
Scott Lahteine
5ed1e7a464
codenum => dwell_ms
2016-07-17 13:35:21 -07:00
Scott Lahteine
69d6016941
Revert default state of endstops in M502
2016-07-17 13:35:21 -07:00