CONSULitAS
a8c1bdabd2
Update: readme.md for K8200 example
...
* readme.md: updated typo and URLs
2015-03-15 17:25:31 +01:00
Scott Lahteine
5efc798642
Merge pull request #1546 from apollo-ng/pr-felix
...
Added support for Felix 2.0/3.0 printers
2015-03-15 07:52:22 -07:00
Scott Lahteine
b83e52e50f
Merge pull request #1467 from thinkyhead/marlin_configurator
...
Configurator utility
2015-03-15 07:49:19 -07:00
Scott Lahteine
7bc77dc134
Merge pull request #1583 from galexander1/m404fix
...
M404 should not use 'N' address as parameter because 'N' is reserved
2015-03-15 07:47:30 -07:00
Scott Lahteine
b80ed51fcc
Fix controllerFan() code
...
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
2015-03-15 06:55:31 -07:00
Scott Lahteine
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-15 06:37:32 -07:00
Scott Lahteine
bb4cb1b15a
Merge pull request #1606 from thinkyhead/cleanup_stepper
...
Cleanup of stepper.cpp
2015-03-15 06:05:08 -07:00
Scott Lahteine
63f41f56f8
Merge pull request #1607 from chris-bo/Development
...
Update ultralcd_st7920_u8glib_rrd.h
2015-03-15 01:04:40 -07:00
Scott Lahteine
4eabd80025
Fix babystep for extruder_duplication
2015-03-14 18:31:25 -07:00
alexborro
d3259d0dba
Merge pull request #1581 from msutas/Development
...
Filament Runout Sensor Feature
2015-03-14 18:35:20 -03:00
chris-bo
b73ba26b23
Update ultralcd_st7920_u8glib_rrd.h
2015-03-14 14:31:00 +01:00
Scott Lahteine
c37f7d15c9
- Rename WRITE_E_STEP for consistency
...
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
2015-03-14 04:28:22 -07:00
chrono
4d878b9bac
Fixed path typos in README
2015-03-14 10:18:12 +00:00
chrono
12ec557a75
Added DEFAULT_TRAVEL_ACCELERATION
2015-03-14 10:14:13 +00:00
chrono
1d25d510bc
Upstream Merge Fixes
2015-03-14 09:48:30 +00:00
chrono
a89d690b77
Merge remote-tracking branch 'upstream/Development' into pr-felix
2015-03-14 09:25:43 +00:00
Scott Lahteine
cb57fc727d
Declare pid_output for PIDBEDTEMP
2015-03-13 20:19:51 -07:00
Scott Lahteine
3d6deb9bdf
Simplify manage_heater
...
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
2015-03-13 19:49:41 -07:00
alexborro
2f3c77b751
Fix decimal places in G29 Bed Equation Coeficients
2015-03-13 14:39:41 -03:00
Scott Lahteine
352aa3f4c5
Merge branch 'Development' into marlin_configurator
...
Latest upstream
2015-03-12 17:12:51 -07:00
Scott Lahteine
e3ca9137b5
Fix missing temp_error declarations
...
- Fix for #1591 replacing #1595
2015-03-11 16:38:42 -07:00
Scott Lahteine
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
2015-03-11 15:47:32 -07:00
Scott Lahteine
e4d77a6313
Merge pull request #1554 from 2PrintBeta/Development
...
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
2015-03-11 15:31:57 -07:00
Mehmet Sutas
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
2015-03-12 00:07:39 +02:00
alexborro
c0b6075f77
Fix max acceleration limits in planner
...
The max acceleration limiting was in wrong place.
2015-03-11 15:08:11 -03:00
alexborro
9157cbd8f3
Add Travel Acceleration and change the M204 options
...
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).
It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves
I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
2015-03-11 13:19:02 -03:00
alexborro
888cf161bd
fix travel speed option for G29
...
I forgot to enclousure the variable with #ifdef
2015-03-11 10:03:32 -03:00
alexborro
af63b54562
Add travel speed option to G29 command line
2015-03-11 09:51:56 -03:00
alexborro
5bf42066fa
Fix typo in configuration.h
2015-03-10 15:06:34 -03:00
alexborro
8a4b62d081
Set more regular setup in configuration.h
2015-03-10 14:41:21 -03:00
alexborro
60ceca1bc1
Add speed configuration for home-bumping movement
2015-03-10 14:08:32 -03:00
domonoky
d813090d90
Merge remote-tracking branch 'remotes/upstream/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
2015-03-10 10:46:37 +01:00
Scott Lahteine
c321c97f35
Merge pull request #1584 from galexander1/stringcleanup
...
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
2015-03-10 01:48:30 -07:00
Mehmet Sutas
956fb2d278
Merge pull request #1 from MarlinFirmware/Development
...
update
2015-03-09 11:05:49 +02:00
Scott Lahteine
978dadf806
Base64 decode AJAX-fetched text properly
2015-03-08 21:54:17 -07:00
Scott Lahteine
0eae9c24bc
Merge pull request #1582 from galexander1/deltaconftypo
...
fix typo in delta example config introduced in commit 697ee2d
2015-03-08 21:13:14 -07:00
Scott Lahteine
624f23f550
Merge pull request #1575 from Wurstnase/fix-controllerFan
...
Fix controller fan
2015-03-08 20:36:38 -07:00
Greg Alexander
ed7874b4e0
M404 should not use 'N' address as parameter because 'N' is reserved for the line number
2015-03-07 17:35:06 -05:00
Greg Alexander
b9dfa5cad4
use code_value_long() instead of (int)code_value()
2015-03-07 17:33:15 -05:00
Greg Alexander
901b03d020
use strtol() instead of strtod() when an integer value is desired
2015-03-07 17:24:26 -05:00
Greg Alexander
4fba7b084f
fix typo in delta example config introduced in
...
commit 697ee2dc50
2015-03-07 16:43:41 -05:00
Mehmet Sutas
cfc6a3a87a
Filament Runout Sensor Feature
...
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.
This feature was requested several times (issue #679 ), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.
The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350 ) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
2015-03-07 22:43:15 +02:00
Wurstnase
a5342c942e
Update Marlin_main.cpp
2015-03-07 16:47:53 +01:00
Scott Lahteine
0f3b7d5575
Update annotated configurations
...
- Also update base configs
2015-03-07 01:07:40 -08:00
Scott Lahteine
c5aa56bc4d
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
2015-03-06 23:00:03 -08:00
Scott Lahteine
d085725c86
More sanity-checking for ABL
...
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
2015-03-06 22:14:34 -08:00
Scott Lahteine
8b6766b37b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-06 16:32:57 -08:00
Scott Lahteine
9eed8c8cf0
Make sure a ROM is selected for ULTRA_LCD
2015-03-06 15:37:54 -08:00
Scott Lahteine
254970c92a
Merge pull request #1570 from C-o-r-E/escape_fix
...
Fixes gCode handling of comments and escaped characters
2015-03-06 15:09:35 -08:00
Scott Lahteine
25dc79f124
Remove M48 credits also
2015-03-06 14:54:30 -08:00
