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

5669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silvio
29337db206 Merge pull request #3 from MarlinFirmware/RCBugFix 
update to latest rcbugfix
 2016-06-13 12:47:42 +02:00
Scott Lahteine
17c86349c0 Merge pull request #4020 from thinkyhead/rc_test_M600 
Fix Travis test for FILAMENTCHANGEENABLE
 2016-06-12 18:50:26 -07:00
Scott Lahteine
b4c37a676f Merge pull request #4025 from thinkyhead/rc_fix_ultralcd_move_e 
Fix manual move for multiple extruders
 2016-06-12 17:27:36 -07:00
Scott Lahteine
4d2119f83a _lcd_move => _lcd_move_xyz 2016-06-12 17:14:19 -07:00
Scott Lahteine
811967923a Fix manual_move to move the correct E stepper 2016-06-12 17:14:19 -07:00
Scott Lahteine
0d0b751498 Merge pull request #4023 from thinkyhead/rc_servo_macros 
Add macros to move servos
 2016-06-12 15:45:39 -07:00
Scott Lahteine
4fbe818163 Add macros to move servos 2016-06-12 15:38:30 -07:00
Scott Lahteine
9a1dfd0f5f Fix Travis test for FILAMENTCHANGEENABLE 2016-06-12 14:24:56 -07:00
Scott Lahteine
e51f8df097 Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond 
No need to check ULTIPANEL with DOGLCD
 2016-06-11 17:39:42 -07:00
Scott Lahteine
b322ac4417 No need to check ULTIPANEL with DOGLCD 2016-06-11 16:50:06 -07:00
João Brázio
8ccd97e7cc
Updated all example configuration files 2016-06-12 00:36:15 +01:00
Scott Lahteine
c7eeb09e8f Merge pull request #4012 from Blue-Marlin/watchdoghealing 
Heal the watchdog
 2016-06-11 16:18:22 -07:00
Scott Lahteine
7fb69e24fb Use "Tn S1" to change tools without moving 2016-06-11 15:58:45 -07:00
Scott Lahteine
2f1bf8373b Merge pull request #4005 from thinkyhead/rc_prepare_move_destination 
Clarify names of prepare_move functions
 2016-06-11 15:51:58 -07:00
João Brázio
de8108648f
Added a versioning system to the config files 2016-06-11 23:48:10 +01:00
Blue-Marlin
efe719f898 Heal the watchgog 2016-06-12 00:34:31 +02:00
Scott Lahteine
b75e648f2c Clarify names of prepare_move functions 2016-06-11 15:32:49 -07:00
Scott Lahteine
d50ba08246 Merge pull request #4011 from thinkyhead/rc_manual_move_cond 
Wrap all items depending on ULTIPANEL
 2016-06-11 15:26:52 -07:00
Scott Lahteine
ae9b09fe94 menu => screen 2016-06-11 14:53:39 -07:00
Scott Lahteine
45ea8749d3 Wrap all items depending on ULTIPANEL 2016-06-11 14:27:34 -07:00
Scott Lahteine
ddbb05fd8d Merge pull request #3998 from jbrazio/bugfix/better-regex 
Improves travis buildroot regexp
 2016-06-11 13:40:58 -07:00
João Brázio
9b3a0895fd
Upgrades travis Arduino IDE version to 1.6.9 2016-06-11 02:55:09 +01:00
João Brázio
280af07b4c
Improves travis buildroot regexp 2016-06-11 02:55:09 +01:00
Scott Lahteine
0e2bfd0769 Use linear feedrate in gcode_T, not volumetric 2016-06-10 18:27:01 -07:00
Scott Lahteine
bf8710d522 Merge pull request #4001 from Blue-Marlin/manage_manual_move-ULTIPANEL 
manage_manual_move(); -> ULTIPANEL
 2016-06-10 17:17:57 -07:00
Scott Lahteine
93ffa0288c Merge pull request #4003 from jbrazio/bugfix/3999 
Closes #3999: Compilation error with BEEPER_PIN -1
 2016-06-10 17:15:23 -07:00
João Brázio
2c34ec2bac
Closes #3999: Compilation error with BEEPER_PIN -1 2016-06-11 00:12:49 +01:00
Blue-Marlin
378ff92e98 manage_manual_move(); -> ULTIPANEL 
Makr the call of   `manage_manual_move() ` depandent of `ULTIPANEL`
 2016-06-10 23:36:57 +02:00
Scott Lahteine
45b701d38c Travis test for LIN_ADVANCE 2016-06-09 21:03:27 -07:00
Scott Lahteine
aad9c0ed8d Apply updated ISR timing code 2016-06-09 21:03:27 -07:00
Scott Lahteine
506d78b2f8 Run the advance_isr faster instead of doing multiple e-steps per interrupt 2016-06-09 21:03:27 -07:00
Scott Lahteine
6d62a4ffc8 Patch LIN_ADVANCE for style and forward-compatibility 2016-06-09 21:03:27 -07:00
Sebastianv650
fb8e880734 Add LIN_ADVANCE 2016-06-09 21:03:27 -07:00
Scott Lahteine
e2d4919c01 Merge pull request #3991 from thinkyhead/rc_axis_units 
Rename some vars to clarify their relationship to acceleration
 2016-06-09 20:57:01 -07:00
Scott Lahteine
4a212f707b Merge pull request #3993 from jbrazio/feature/update-travis 
Update travis to test for ULTRA and DOG LCD options
 2016-06-09 20:56:07 -07:00
Scott Lahteine
74060f17b7 Merge pull request #3995 from thinkyhead/rc_nonblocking_buzzer 
New feature: Non blocking tone queue
 2016-06-09 20:55:29 -07:00
João Brázio
d13c86f6f6 Adds travis test for SPEAKER 2016-06-09 20:38:23 -07:00
Scott Lahteine
a82c755a35 Fix BQ_LCD_SMART_CONTROLLER pin compiler warnings 2016-06-09 20:38:23 -07:00
João Brázio
5b5aa1572b Non-blocking buzzer 2016-06-09 20:20:05 -07:00
Scott Lahteine
27d5794298 Merge pull request #3992 from thinkyhead/rc_pid_autotune_e_range 
Throw an error in PID_autotune for E < -1
 2016-06-09 20:07:27 -07:00
João Brázio
24e70c915d
Update travis to test for ULTRA and DOG LCD options 2016-06-10 02:25:37 +01:00
Scott Lahteine
72c6f2923f axis_steps_per_unit => axis_steps_per_mm 2016-06-09 17:04:51 -07:00
Scott Lahteine
446515ab79 Adjust spacing in block_t 2016-06-09 17:04:51 -07:00
Scott Lahteine
80ab749563 Rename acceleration locals for clarity 2016-06-09 17:04:51 -07:00
Scott Lahteine
3b08eb1eeb acceleration_st => acceleration_steps_per_s2 2016-06-09 17:04:51 -07:00
Scott Lahteine
cb4704e07a Rename some planner acceleration vars 
- `per_sq_second` => `per_s2`
- `per_sqr_second` => `per_s2`
- `axis_steps_per_sqr_second` => `max_acceleration_steps_per_s2`
 2016-06-09 17:04:50 -07:00
Scott Lahteine
3c68be79dc Throw an error in PID_autotune for E < -1 2016-06-09 16:41:53 -07:00
Scott Lahteine
26f8f54c56 Merge pull request #3985 from thinkyhead/rc_inch_fahrenheit_kelvin 
Support inches, fahrenheit, and kelvin
 2016-06-08 20:10:33 -07:00
Scott Lahteine
f0a5b7f0bc Merge pull request #3986 from thinkyhead/rc_mbl_forward_iteration 
Use memset in mbl.reset to save 58 bytes
 2016-06-08 17:33:41 -07:00
Scott Lahteine
38279a02b2 Travis tests for Inch, Fahrenheit, Kelvin, M100 2016-06-08 17:12:54 -07:00