melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,941 Commits 2 Branches 0 Tags 2 GiB
7b21811a9a
Commit Graph

5941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
52b6b8e36b Merge pull request #4512 from thinkyhead/rc_encoder_flex 
Improved SCREEN / MENU macros
 2016-08-02 18:59:42 -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
58749cae94 Merge pull request #4510 from thinkyhead/rc_buzzer_needs_beeper 
Patch for COREYZ, tweak to scaled feedrate macro
 2016-08-02 15:55:06 -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
1967e4216e Merge pull request #4504 from AnHardt/fix-baybystepping 
Fix babystepping dependency
 2016-08-02 12:46:50 -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
João Brázio
b15ef35568
Update the font README to link to marlinfw.org 2016-08-01 13:53:51 +01: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
Scott Lahteine
f7da37002c Merge pull request #4482 from AnHardt/rep-s-spi 
repair-software-spi
 2016-07-31 15:25:44 -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
Scott Lahteine
448e5252c3 Merge pull request #4474 from esenapaj/Update-distribution-date-and-readme 
Update distribution date and readme
 2016-07-31 01:07:43 -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
Scott Lahteine
a406b176b0 Merge pull request #4472 from thinkyhead/rc_old_conditional 
Make Conditionals.h a catch-all for old configs
 2016-07-30 04:34:43 -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